shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph
107 Commits
Author SHA1 Message Date
vuonojenmustaturskaandCitadelStationBot 5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
MercenaryblueandCitadelStationBot 06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -05:00
Jordan BrownandCitadelStationBot bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LeoandCitadelStationBot c873c17478 Merge pull request #31284 from tgstation/Cyberboss-patch-1 
Code cleanup in snack_meats.dm
 2017-10-04 19:27:47 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot 126020185d Monkey Cubes expanding will give the new monkey an attack log with their creator (#31236) 
* Update snacks_meat.dm

* no one wants to see that

* WE'RE JUST SENDING IT TO ONE PLACE COBBY

* boop

* cool leoz tricks

* Update snacks_meat.dm
 2017-10-03 17:56:14 -05:00
orangesandCitadelStationBot baf72b8412 Merge pull request #31064 from YPOQ/silverfriedfoods 
Silver slime extracts create proper fried foods
 2017-09-28 21:55:42 -05:00
LetterJayandGitHub dab03b249d Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992 
[MIRROR] Spiderpalooza 1: Foods!
 2017-09-26 15:01:02 -04:00
ArmhulenandCitadelStationBot a7d0b50808 Spiderpalooza 1: Foods! 2017-09-26 11:32:36 -05:00
jughuandCitadelStationBot 14fba23c55 Adds two more IMPORANT color burger colors (#31010) 
* Update snacks_burgers.dm

* Update recipes_burger.dm

* Update snacks_burgers.dm

* Update snacks_burgers.dm
 2017-09-26 08:52:27 -05:00
CitadelStationBotandPoojawa 1d1badde40 [MIRROR] Fixes chemfridges not displaying items with dots in their name properly (#2844) 
* Fixes chemfridges not displaying items with dots in their name properly

* Fixes chemfridges not displaying items with dots in their name properly
 2017-09-17 22:15:22 -05:00
CitadelStationBotandPoojawa d156fecdbf [MIRROR] Fixes skinless species dropping human skin when gibbed (#2735) 
* Fixes skinless species dropping human skin when gibbed (#30649)

* fix gibbing skinless species

* = loc -> forceMove(loc)

* oops

* Fixes skinless species dropping human skin when gibbed
 2017-09-14 07:52:03 -05:00
LetterJayandGitHub dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJayandGitHub b73b6a967a Merge pull request #2680 from Citadel-Station-13/upstream-merge-30519 
[MIRROR] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
 2017-09-11 18:44:40 -05:00
LetterJayandGitHub 6cc0ea6af0 Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412 
[MIRROR] Regularizes resisting out of containers
 2017-09-11 18:05:52 -05:00
LetterJayandGitHub c3a1c08206 Update smartfridge.dm 2017-09-11 17:51:49 -05:00
LetterJay 14aefe2e64 commit 2017-09-11 14:01:42 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
orangesandCitadelStationBot adc85f0edc In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed 2017-09-10 06:00:52 -05:00
kingofkosmosandCitadelStationBot cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -05:00
kevinz000 3f16272717 line endings ree 2017-08-29 19:57:58 -07:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJayandGitHub defab9c7fc Merge branch 'master' into upstream-merge-29923 2017-08-28 09:19:44 -05:00
LetterJayandGitHub 739d5c70a7 Update meat.dm 2017-08-28 09:17:14 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBot 41b0f9f9d4 Gorillas 2017-08-20 19:56:21 -05:00
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot f7bde6a76a Makes mixing meth dangerous again 2017-08-18 18:59:58 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot 4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBotandPoojawa dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
LetterJayandGitHub 03e508475f Merge pull request #2216 from Citadel-Station-13/upstream-merge-29601 
[MIRROR] Spellchecking
 2017-08-01 17:07:56 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot d176fcf24c Refactors pie throwing and fixes throwing not finalizing in some cases 2017-08-01 07:48:16 -05:00
kevinz000andGitHub bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJayandGitHub 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBotandkevinz000 adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBotandkevinz000 2fb28c97c7 Pizza box additions (#2111) 2017-07-24 04:06:31 -07:00
LetterJayandGitHub 85f1b25bcd Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
 2017-07-19 06:29:06 -05:00