shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

277 Commits

Author SHA1 Message Date
CitadelStationBot
9ac752afb4 Makes chemical payload bomb cores less misleading (#2151) 2017-07-26 22:56:27 -07:00
CitadelStationBot
cf87bf20f5 makes gulag beacon indestructible (#2123) 2017-07-26 00:06:21 -07:00
CitadelStationBot
37b9e24bc0 Removes the gulag sink and water bottles from the sustenance vendor. (#2094) 2017-07-24 04:08:56 -07:00
CitadelStationBot
5db90b28dc Fixes the party alarm (#2082) 2017-07-21 07:05:29 -07:00
CitadelStationBot
bfcb068f21 Adds proper containers for some locates (#2080) 2017-07-20 06:31:25 -07:00
LetterJay
1e2fd6c235 Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293 
[MIRROR] Made cell / holding cell windoors their own subtype
 2017-07-19 13:41:37 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
LetterJay
a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228 
[MIRROR] Fixes IV Drips
 2017-07-19 05:02:19 -05:00
LetterJay
b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
755de4f223 Made cell / holding cell windoors their own subtype 2017-07-17 06:52:17 -05:00
CitadelStationBot
3066f32215 Improves drone detonation logging (#2037) 2017-07-17 00:53:00 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
LetterJay
8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
kevinz000
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
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
CitadelStationBot
1dc34f7383 Fixes IV Drips 2017-07-14 06:38:40 -05:00
LetterJay
9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot
e43af7f1bd [MIRROR] get_edge_target_turf() now finds the proper turf when using diagonal directions (#1972) 
* get_edge_target_turf() now finds the proper turf when using diagonal directions

* Update camera.dm
 2017-07-10 16:15:02 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
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
CitadelStationBot
b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot
be15914a6f Minor code clean up in magnet controller (#1921) 2017-07-07 04:47:52 -07:00
CitadelStationBot
b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
793a2ce28f Grammar and message tweaks (#1722) 2017-07-01 21:22:29 -07:00
katnep
b21556329b TAUR SWEATERS and keyhole (#1827) 
by request of annoying whiners, here are sweaters in the clothes mate
have fun
 2017-06-30 21:25:17 -07:00
CitadelStationBot
57bf6fc7ba Machinery clears it's occupant var if removed (#1767) 2017-06-30 20:42:58 -07:00
CitadelStationBot
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
c7d4809579 Reduces default brig times to be consistent with suggested policy. (#1609) 2017-06-28 04:07:43 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay
d138c56781 Merge pull request #1664 from Citadel-Station-13/upstream-merge-28505 
[MIRROR] Vending machines accept space cash.
 2017-06-26 06:15:19 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBot
68498b3597 RADIMMUNE species can no longer be used for radiation free DNA research (#1553) 2017-06-20 08:02:38 -07:00
CitadelStationBot
30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot
341a229b94 Vending machines accept space cash. 2017-06-18 20:35:08 -05:00
CitadelStationBot
4c3f515fd6 Fixes borging factory (#1580) 2017-06-17 13:30:27 -07:00
LetterJay
a1bd66ef8b Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414 
[MIRROR] Adds onions
 2017-06-17 10:04:59 -05:00
CitadelStationBot
f86bda7cda Adds onions 2017-06-16 16:22:38 -05:00