shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,023 Commits 5 Branches 0 Tags
0381765c81249d633531ced3d25a2fc01fd303f6
Commit Graph
3056 Commits
Author SHA1 Message Date
LetterJayandGitHub ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
LetterJayandGitHub aaee67bee5 Merge pull request #4858 from Citadel-Station-13/upstream-merge-34449 
[MIRROR] Fixes recycler/anything with mat container emagging.
 2018-01-17 09:39:05 -06:00
LetterJayandGitHub 8a04f19e0a Merge pull request #4877 from Citadel-Station-13/upstream-merge-34470 
[MIRROR] Moves load_motd to config controller
 2018-01-17 09:36:43 -06:00
LetterJayandGitHub a05b64c7e7 Merge pull request #4876 from Citadel-Station-13/upstream-merge-34429 
[MIRROR] Fix RPD embedding fixtures inside lattices and girders
 2018-01-17 09:36:33 -06:00
LetterJayandGitHub 127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
kevinz000andCitadelStationBot ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
orangesandCitadelStationBot 1f7e25be0a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-16 14:28:17 -06:00
orangesandCitadelStationBot 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
orangesandCitadelStationBot 9ff1be35cc Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-16 14:26:53 -06:00
LetterJayandGitHub 05989168e7 Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401 
[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
 2018-01-16 13:49:32 -06:00
LetterJayandGitHub 7d7042fc60 Merge pull request #4871 from Citadel-Station-13/upstream-merge-34475 
[MIRROR] Makes tanks made of metal
 2018-01-16 13:49:18 -06:00
LetterJayandGitHub fcb61314fd Merge pull request #4869 from Citadel-Station-13/upstream-merge-34478 
[MIRROR] Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
 2018-01-16 13:48:57 -06:00
BordListianandCitadelStationBot 1a7341f2c4 Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401) 
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
 2018-01-16 08:36:27 -06:00
Jordan BrownandCitadelStationBot 6977eb6ce2 Merge pull request #34475 from ShizCalev/internals-metal 
Makes tanks made of metal
 2018-01-16 08:34:13 -06:00
Jordan BrownandCitadelStationBot af857d0c0b Merge pull request #34478 from ChangelingRain/runtimefix 
Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
 2018-01-16 08:32:50 -06:00
AnturKandCitadelStationBot 89766bdc4e Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 07:33:41 -06:00
LetterJayandGitHub 3c281161b8 Merge pull request #4853 from Citadel-Station-13/upstream-merge-34385 
[MIRROR] Greyscale wirecutters
 2018-01-16 03:53:36 -06:00
LetterJayandGitHub 2e901c3ada Merge pull request #4852 from Citadel-Station-13/upstream-merge-34480 
[MIRROR] Adds a new bar sign - The Lightbulb
 2018-01-16 03:53:13 -06:00
LetterJayandGitHub 5ffbaf5e16 Merge pull request #4851 from Citadel-Station-13/upstream-merge-34448 
[MIRROR] Lowers clockwork ark global sound loop volume
 2018-01-16 03:52:20 -06:00
kevinz000andCitadelStationBot 2df3695048 Fixes recycler/anything with mat container emagging. 2018-01-16 03:51:50 -06:00
LetterJayandGitHub 7b673a4262 Merge pull request #4846 from Citadel-Station-13/upstream-merge-34061 
[MIRROR] Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-16 03:51:30 -06:00
MoreRobustThanYouandCitadelStationBot 053fe00021 Greyscale wirecutters (#34385) 
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
 2018-01-15 15:16:47 -06:00
Ashe HiggsandCitadelStationBot 9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
kevinz000andCitadelStationBot c22c5fe25d Lowers ark volume 2018-01-15 15:05:19 -06:00
deathride58andGitHub 30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325 
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
 2018-01-15 15:40:45 +00:00
deathride58andGitHub bd90207710 Merge pull request #4843 from Citadel-Station-13/upstream-merge-34309 
[MIRROR] Remakes the space syndicate listening post.
 2018-01-15 15:39:32 +00:00
deathride58andGitHub aea0bb0394 Merge pull request #4842 from Citadel-Station-13/upstream-merge-34371 
[MIRROR] Fixes missing pipe colors in RPD and pipe painter
 2018-01-15 15:39:04 +00:00
Kyle Spier-SwensonandCitadelStationBot 32adfdae00 Fixes compiler errors in the preload_rsc external resource thingy (#34061) 
Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-15 09:33:07 -06:00
Emmett GainesandCitadelStationBot a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
WJohnandCitadelStationBot 16596405e1 Remakes the space syndicate listening post. (#34309) 
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
 2018-01-15 07:18:15 -06:00
ShizCalevandCitadelStationBot 8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
coiaxandCitadelStationBot 497e6bb13f Various deadchat messages are more informative and consistent (#34326) 
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
 2018-01-15 02:56:10 -06:00
deathride58andGitHub 14ae9ace64 Merge pull request #4831 from Citadel-Station-13/upstream-merge-34374 
[MIRROR] Rocket Pods now require manual disassembly
 2018-01-15 06:18:29 +00:00
deathride58andGitHub 2b859638e9 Merge pull request #4836 from Citadel-Station-13/upstream-merge-34396 
[MIRROR] Fixed alt-click not working with stacks
 2018-01-15 06:17:51 +00:00
John GinnaneandCitadelStationBot ac1b2f76ef Fixed alt-click not working with stacks (#34396) 
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
 2018-01-14 22:05:07 -06:00
F-OSandCitadelStationBot af1d40ca52 Tweaks spaceheater description (#34416) 
* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Allah my loving lord and savior grant me mercy
 2018-01-14 22:03:57 -06:00
IamgoofballandCitadelStationBot a5a1838bcb Rocket Pods now require manual disassembly (#34374) 
Bluespacing out simply wasn't metal enough tbh
 2018-01-14 21:59:20 -06:00
deathride58andGitHub 87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338 
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
 2018-01-14 04:01:33 +00:00
ShizCalevandCitadelStationBot 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
AnturKandCitadelStationBot 269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
deathride58andGitHub 6b5f8b0cad Merge pull request #4810 from Citadel-Station-13/upstream-merge-34347 
[MIRROR] Fix the Ark's z-level checks
 2018-01-13 20:28:43 +00:00
deathride58andGitHub c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357 
[MIRROR] Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 20:27:54 +00:00
deathride58andGitHub 0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 20:24:13 +00:00
deathride58andGitHub 90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699 
[MIRROR] Makes vault safe slightly less explosion-proof
 2018-01-13 20:22:05 +00:00
deathride58andGitHub 80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313 
[MIRROR] Fix airlock console HTML
 2018-01-13 20:21:03 +00:00
LeoandCitadelStationBot 96679b1c0d Merge pull request #34347 from AutomaticFrenzy/patch/ark-z 
Fix the Ark's z-level checks
 2018-01-13 09:01:09 -06:00
LeoandCitadelStationBot ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime 
Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 08:58:44 -06:00
orangesandCitadelStationBot 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
orangesandCitadelStationBot e164b0cf25 Merge pull request #33699 from QualityVan/safedestruction 
Makes vault safe slightly less explosion-proof
 2018-01-13 04:17:27 -06:00
LeoandCitadelStationBot 9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller 
Fix airlock console HTML
 2018-01-12 12:57:52 -06:00