adds stormtrooper armor and helmet and a cargo crate for them working edition maybe thanks to missatesatessy for heping me #7256
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Your branch doesn't appear to be up-to-date, since it's reversed a ton of changes. |
|
Sorry about that I鈥檒l get images in a few hours |
fixed |
grimm-hollowknight
approved these changes
Dec 7, 2019
grimm-hollowknight
added
Stale
yogstation13-bot
added a commit
that referenced
this pull request
Dec 12, 2019
Mr-Space
added a commit
to Mr-Space/Yogstation
that referenced
this pull request
Dec 14, 2019
* Automatic changelog generation yogstation13#7183 [ci skip] * Revert "Label workflow" * Silicolysis buff (yogstation13#7127) * Automatic changelog generation yogstation13#7127 [ci skip] * map tweaks * Adds an achievement for creating a borg as a roboticist (yogstation13#7204) * adds an achievement for creating a borg * locks it to robos only * adds dilithium canister (yogstation13#7202) * Automatic changelog generation yogstation13#7202 [ci skip] * Automatic TGUI rebuilding on master branch via Github Actions (#47961) About The Pull Request Uses actions to automatically rebuild tgui if files are changed, then push the result. Triggers on push to master, pushes results to master. Also disables build checking in Travis because it's unimportant now. * Update autobuild Github action (#48090) * demodularise * tgstation/tgstation#47135 * tgstation/tgstation#47230 * tgstation/tgstation#47585 * tgstation/tgstation#47686 * comms console now allows aghost admins to AI-interact (yogstation13#7130) * comms console now allows aghost admins to AI-interact * fucks * removes a spare 0 from the tgui-next UI * Update achievements.dm name = "Kick Ass and Chew Bubblegum." desc = "Kill Bubblegum, the king of slaughter demons." //Should be improved(?) * Adds Catastrophe achievement Emag a PA to get it * Revert "Adds Catastrophe achievement" This reverts commit 6889f2d. * Adds the Catastrophe achievement Emag a PA to get it * adds a 10% chance of getting a bluespace emag if you emag an emag * oops * Automatic changelog generation yogstation13#7214 [ci skip] * Automatic changelog generation yogstation13#7212 [ci skip] * Automatic changelog generation yogstation13#7213 [ci skip] * Automatic changelog generation yogstation13#7198 [ci skip] * Update lighting.dm * #fuck merge conflicts * powergamers-mad-x24 * fucking ktlsws * Automatic changelog generation yogstation13#7131 [ci skip] * Reworks the achievements subsystem to actually instanciate them * Adds 3 new achievements * Apply suggestions from code review Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com> * map things * Badass syndie achievement * redesigns testing range * Add lead lined achievement * Add wizard win achievement * Add CPR and changeling win achievements * Add shadowling ascending achievement * fix the random parallax layers not working (yogstation13#7225) * Automatic changelog generation yogstation13#7225 [ci skip] * Add 3 more achievements, one for dying and two related to being cremated * Automatic changelog generation yogstation13#7220 [ci skip] * fixes eggpeople being invisible (yogstation13#7232) * Automatic changelog generation yogstation13#7232 [ci skip] * Make lockers airtight when welded * Update marrow_weaver.dm (yogstation13#7227) * Automatic changelog generation yogstation13#7227 [ci skip] * redoes the achievements UI once more * adds support for hiding achievement descriptions untill they've been achieved * fuck you github * Added the RCD (yogstation13#7230) Tested before commit. it works. * Automatic changelog generation yogstation13#7230 [ci skip] * Update autolathe_designs.dm (yogstation13#7215) * Automatic changelog generation yogstation13#7215 [ci skip] * add short_desc (yogstation13#7224) * allows you to create insulin (yogstation13#7208) * Update medicine.dm * retard * Unoppresses Mentors pt.1 & 2 (yogstation13#7231) * tag * where did that line go * Update code/modules/client/verbs/ooc.dm Co-Authored-By: monster860 <mnmaxim@gmail.com> * Update ooc.dm * ooc color pref * bRaCkEtS * Automatic changelog generation yogstation13#7231 [ci skip] * Stray pixels * Makes Parmesan great again * strips html on modular computer printer * Update printer.dm * department biohazard locker * Glockroaches (yogstation13#7229) * Glockroaches port Adds glockroaches. Next commit will be simplemob interactions * Simple mob interaction Ports simple mob ineraction from This will add functionality to add simple mobs * FUCK Adds sound. TG simplemobs are different too. It works! * Automatic changelog generation yogstation13#7229 [ci skip] * Automatic changelog generation yogstation13#7245 [ci skip] * demodularise * meatball icon * Clock cult stuff >More map things. >Change Airlocks correect airlock. Remove lots of randowm loot Spawners but i still leave some * Revert "Clock cult stuff" This reverts commit b903e7a. * Clock Cult Woot >More map things. >Change Airlocks correect airlock. Remove lots of randowm loot Spawners but i still leave some * Something i forgot Space makes you float who would of thought... I forgot that you need the /area/space/nearstation) when i made this map a long time ago. * Makes PDA messages use the language system * Makes paper use the language system somewhat. Removes info_links. * Automatic changelog generation yogstation13#7263 [ci skip] * Now you can use runes on CentCom mapmerge finally work * f (yogstation13#7271) * Automatic changelog generation yogstation13#7271 [ci skip] * fix runtime for using strange reagent on simplemobs (yogstation13#7267) * Update medicine_reagents.dm * Update medicine_reagents.dm * Automatic changelog generation yogstation13#7267 [ci skip] * Makes dilithium crystals visually different from BS crystals (yogstation13#7246) * Adds separate dilithium * Adds own visual * Automatic changelog generation yogstation13#7246 [ci skip] * change fridges to bar access * [s] Fixes a couple of exploits (yogstation13#7273) * Update drink_reagents.dm * Update other_reagents.dm * Update food_reagents.dm * Automatic changelog generation yogstation13#7273 [ci skip] * f * Adds new player friendly to the server title ### Intent of your Pull Request Maybe it will attract more players #### Changelog :cl: tweak: changes hub line /:cl: * okay makes | not * aeeeeeeeaeaeaeaeaeaeaeaeaeaeaee merge my pr * Adds BUG option to adminhelp admin menu * Automatic changelog generation yogstation13#7221 [ci skip] * Automatic changelog generation yogstation13#7277 [ci skip] * fixkckc * Automatic changelog generation yogstation13#7281 [ci skip] * Update species.dm * a * Update human_defines.dm * Update dna_vault.dm * Update human_defines.dm * Update dna_vault.dm * Update cult_items.dm * Automatic changelog generation yogstation13#7222 [ci skip] * Automatic changelog generation yogstation13#7251 [ci skip] * gloves of the north star can no longer be exploited (yogstation13#7283) * Automatic changelog generation yogstation13#7274 [ci skip] * f * Ninja jail is no longer permanent (yogstation13#7178) * Add files via upload * ninja man explodes * Ignore that. * Use list instead of trait and makes the proc go off after the implant activation rather than as soon as you click the icon * fuck * the hell is a newline * Update ninja.dm * goddamnit * Checks if the player is actually still in the dojo * Automatic changelog generation yogstation13#7178 [ci skip] * Revert "Ninja jail is no longer permanent (yogstation13#7178)" (yogstation13#7287) This reverts commit f5b602c. * Automatic changelog generation yogstation13#7286 [ci skip] * Automatic changelog generation yogstation13#7276 [ci skip] * Test jobama * wording fix HONK fuck! * Animates dab emote (yogstation13#7290) * Automatic changelog generation yogstation13#7290 [ci skip] * Revert "Animates dab emote (yogstation13#7290)" (yogstation13#7291) This reverts commit 7a257e7. * Revert "Revert "Animates dab emote(yogstation13#7290)" (yogstation13#7291)" * Theos be like Okay boomer * Coco now using milk instead of water Super important please fix! * LoneOP? ON MY TEST SERVER!? * Create FUNDING.yml * Automatic changelog generation yogstation13#7293 [ci skip] * Automatic changelog generation yogstation13#7278 [ci skip] * Automatic changelog generation yogstation13#7226 [ci skip] * Automatic changelog generation yogstation13#7234 [ci skip] * Automatic changelog generation yogstation13#7262 [ci skip] * Automatic changelog generation yogstation13#7216 [ci skip] * Automatic changelog generation yogstation13#7265 [ci skip] * Automatic changelog generation yogstation13#7295 [ci skip] * I guess * Automatic changelog generation yogstation13#7270 [ci skip] * Update autobuild_tgui.yml * this is just a test, I'll revert it later * lol * Automatic TGUI Rebuild [ci skip] * auto-build is gone 馃 * achive * server * Makes written initialize in Initialize() in paper.dm * Update uplink_items.dm * Moves some code around and creates /proc/scramble_HTML for languages * Allows the prewritten text on paper to also have a language * Forgot to push a line fuck * Fixes missing variable compiletime in paper.dm * Makes several premade papers have a language they're written in * someone said this was important to note * Update CODEOWNERS.md [ci skip] * emag does the thing * Map changes for monstermos * Automatic changelog generation yogstation13#7307 [ci skip] * more non sense * Adds language to prewritten papers defined in /yogstation/code/ * Automatic changelog generation yogstation13#7304 [ci skip] * [s] (yogstation13#7292) * Update reinf_floor.dm * Update pipe.dm * Conveyor belts stack to 30 (yogstation13#7294) Fixed. It compiles. Fixed. It works! * Automatic changelog generation yogstation13#7294 [ci skip] * adds a tacti cool kit based off of neo (yogstation13#7233) * neo * Update code/game/objects/items/storage/uplink_kits.dm Co-Authored-By: Theos <theubernyan@gmail.com> * Update uplink_kits.dm * stimulants * Update uplink_kits.dm * Update uplink_kits.dm * Automatic changelog generation yogstation13#7233 [ci skip] * adds stormtrooper armor and helmet and a cargo crate for them working edition maybe thanks to missatesatessy for heping me (yogstation13#7256) * Add files via upload * Update packs.dm * Update armor.dm * Update helmet.dm * i deleted all new crates by mistake this should fix it * Update packs.dm * Automatic changelog generation yogstation13#7256 [ci skip] * wouldthisfixit? (yogstation13#7313) * Update motd.txt * beep * Automatic changelog generation yogstation13#7317 [ci skip] * ssssssssss * Automatic changelog generation yogstation13#7319 [ci skip] * I think this does the thing probably tm * cringecode * Update dna_vault.dm * bruh moment * fixed the code * Automatic changelog generation yogstation13#7282 [ci skip] * Automatic changelog generation yogstation13#7303 [ci skip] * Automatic changelog generation yogstation13#7312 [ci skip] * Automatic changelog generation yogstation13#7268 [ci skip]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Intent of your Pull Request
adds a set of storm trooper armor to the game and allows you to buy this crate through cargo and open it if you have security access
thanks to magus 9 for the sprites(https://www.reddit.com/r/SS13/comments/65fjmm/star_wars_sprites_for_ss13/)
and Missatessatessy for guiding me through what i did wrong
Changelog
馃啈
rscadd: Added a new crate and stormertrooper armor
imageadd: added stormtrooper sprites
/馃啈