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

115 Commits

Author SHA1 Message Date
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07: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
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
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
da324257fe [MIRROR] Supermatter code cleanup (#1964) 
* Supermatter code cleanup

* Delete supermatter.dm.rej

* Update supermatter.dm
 2017-07-13 06:38:17 -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
b3c3cf7537 Switches SM squawk to report integrity (#1956) 2017-07-10 06:45:06 -07:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
4133d62161 [MIRROR] New portable generator icons (#1943) 
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-08 21:50:51 -07:00
CitadelStationBot
b0cf4a2e37 Removed silicon SM interact message (#1929) 2017-07-07 10:35:55 -07:00
CitadelStationBot
9a4698874f Adds alarm sounds to SM (#1932) 2017-07-07 10:34:58 -07:00
CitadelStationBot
be5ad79fa2 Changes SM integrity rounding (#1925) 2017-07-07 10:33:45 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
488f6350ed Revert "Freezers and heaters now drop the correct materials" (#1819) 2017-06-30 20:49:04 -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
83da8141f4 Fixes SM getting energy when hit in space. (#1723) 2017-06-30 18:41:49 -07:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
595f50c95e Freezers and heaters now drop the correct materials (Fixes #28560) 2017-06-19 21:27:30 -05:00
LetterJay
050a6bfcdb Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466 
[MIRROR] Adjusted atmos device layers + added new pipe subtypes
 2017-06-17 10:03:54 -05:00
CitadelStationBot
185d0cd3f4 Adjusted atmos device layers + added new pipe subtypes 2017-06-16 15:25:38 -05:00
CitadelStationBot
8a1a4dd671 Hand drill, jaws of life, and emitter grammar tweaks 2017-06-16 15:19:22 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
564426fe3e Makes cable great again 2017-06-05 16:39:37 -05:00
CitadelStationBot
94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00
CitadelStationBot
48c439aaac Fix cable coil dupe and APC icon oddity 2017-06-02 14:11:29 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
LetterJay
775ce7a9eb Merge pull request #1283 from Citadel-Station-13/upstream-merge-27797 
[MIRROR] Speeds up apc visual updates
 2017-05-29 15:02:17 -05:00
CitadelStationBot
8d5c202774 Speeds up apc visual updates 2017-05-29 09:14:01 -05:00
CitadelStationBot
84c9682114 Cable coils New -> Initialize 2017-05-29 06:34:17 -05:00
LetterJay
aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
LetterJay
42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay
7eb798931a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27595 2017-05-28 14:36:01 -05:00
CitadelStationBot
9f665647c2 Ports cable structures to Initialize 2017-05-28 08:13:16 -05:00
CitadelStationBot
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot
29384db52f Improves collector feedback 2017-05-24 18:20:41 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay
e966230ed9 logging 2017-05-24 08:19:45 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
84e30c6824 Adds extra investigate logs for SM 2017-05-22 11:36:40 -05:00
CitadelStationBot
12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -05:00
CitadelStationBot
88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
CitadelStationBot
778d809ff3 Fixes gravity generator admin spam 2017-05-19 13:48:39 -05:00
CitadelStationBot
f2c83f8ced SM speaks on engineering channel, now with 100% less freeze (#984) 2017-05-18 11:55:47 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00