shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,528 Commits 5 Branches 0 Tags
2df062f583d56cf83e0ebec44aa35deaae7ff5af
Commit Graph
82 Commits
Author SHA1 Message Date
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
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBotandkevinz000 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000andGitHub 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBotandkevinz000 f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot 194a6b7aa9 [Seriously, it's ready]Virology Rework: The Thresholdening 2017-07-13 17:46:25 -05:00
CitadelStationBotandkevinz000 ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBotandkevinz000 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBotandkevinz000 9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
CitadelStationBot 6a38955803 Adds container types INJECTABLE and DRAWABLE 2017-06-27 08:19:49 -05:00
LetterJayandGitHub 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
LetterJayandGitHub f367878119 Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773 
[MIRROR] Splits mining_mobs.dm into separate files
 2017-06-08 03:30:13 -05:00
CitadelStationBot e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -05:00
LetterJayandGitHub 35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay 3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00
CitadelStationBotandkevinz000 e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBot afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
LetterJayandGitHub 1b4d2b330f Merge pull request #1047 from Citadel-Station-13/upstream-merge-27343 
[MIRROR] Fixes custom slices not inheriting name
 2017-05-18 23:46:20 -04:00
CitadelStationBot fa1b651799 Fixes custom slices not inheriting name 2017-05-18 16:37:54 -05:00
CitadelStationBot 0c0c1e378b Fixes obtaining blob chems 2017-05-18 16:36:54 -05:00
CitadelStationBotandPoojawa 6ec7f5c3e0 [MIRROR] Ports gibbers to Initialize (#870) 
* Ports gibbers to Initialize

* Update gibber.dm

* Delete gibber.dm.rej
 2017-05-18 05:16:36 -05:00
CitadelStationBotandPoojawa cb03dd5d0d [MIRROR] Smartfridges only come preloaded at map start (#837) 
* Smartfridges only come preloaded at map start

* update CitadelStation-1.2.1.dmm
 2017-05-18 01:12:31 -05:00