shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,123 Commits 5 Branches 0 Tags
08809072bbdc30d44e38e1555c2bbcd09a36aeb5
Commit Graph

3076 Commits

Author SHA1 Message Date
Jordan Brown
08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
Leo
0d6d7116ff Merge pull request #34533 from Buggy123/patch-56 
Fixes integrity value for non-reinforced plasma window
 2018-01-18 06:11:01 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58
45818d03b3 Merge pull request #4901 from Citadel-Station-13/upstream-merge-33916 
[MIRROR] [READY] Allows the supermatter's radiation collectors to produce research points in short bursts
 2018-01-17 20:15:38 +00:00
deathride58
e8e6b3e770 Merge pull request #4899 from Citadel-Station-13/upstream-merge-34500 
[MIRROR] fixes a mass recall runtime error that prevented it from working
 2018-01-17 20:14:55 +00:00
deathride58
e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319 
[MIRROR] Fails travis on common mapping mistakes
 2018-01-17 20:12:39 +00:00
deathride58
a0319643bd Merge pull request #4887 from Citadel-Station-13/upstream-merge-34378 
[MIRROR] Pirates are now skeletons
 2018-01-17 20:11:12 +00:00
deathride58
7b4214b199 Merge pull request #4886 from Citadel-Station-13/upstream-merge-34427 
[MIRROR] Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow
 2018-01-17 20:10:45 +00:00
deathride58
a0a3232360 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916) 
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
 2018-01-17 11:18:21 -06:00
LetterJay
bf7a6e4340 Merge pull request #4885 from Citadel-Station-13/upstream-merge-34464 
[MIRROR] Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-17 10:06:17 -06:00
LetterJay
59e5a71e78 Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468 
[MIRROR] Cleans up some redundant stripped_input usage
 2018-01-17 09:45:04 -06:00
LetterJay
6bcf918111 Update message.dm 2018-01-17 09:40:34 -06:00
LetterJay
ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
Jordan Brown
b6150e8525 Merge pull request #34500 from Xhuis/recallfix 
fixes a mass recall runtime error that prevented it from working
 2018-01-17 07:10:30 -06:00
LetterJay
127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
oranges
3a3ff21fbf Merge pull request #34378 from nicbn/yarr 
Pirates are now skeletons
 2018-01-16 14:34:59 -06:00
Ashe Higgs
33de2bd2f9 Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow (#34427) 
* Portal tweaks, and blocked atmos

* Update servant_blocker.dm

* Update servant_blocker.dm

* Update servant_blocker.dm
 2018-01-16 14:33:46 -06:00
oranges
25fc0d0161 Merge pull request #34464 from uraniummeltdown/dumbcult 
Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-16 14:32:33 -06:00
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
oranges
1f7e25be0a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-16 14:28:17 -06:00
oranges
2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
oranges
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
LetterJay
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
LetterJay
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
LetterJay
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
BordListian
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 Brown
6977eb6ce2 Merge pull request #34475 from ShizCalev/internals-metal 
Makes tanks made of metal
 2018-01-16 08:34:13 -06:00
Jordan Brown
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
AnturK
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
LetterJay
3c281161b8 Merge pull request #4853 from Citadel-Station-13/upstream-merge-34385 
[MIRROR] Greyscale wirecutters
 2018-01-16 03:53:36 -06:00
LetterJay
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
LetterJay
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
kevinz000
2df3695048 Fixes recycler/anything with mat container emagging. 2018-01-16 03:51:50 -06:00
LetterJay
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
MoreRobustThanYou
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 Higgs
9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
kevinz000
c22c5fe25d Lowers ark volume 2018-01-15 15:05:19 -06:00
deathride58
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
deathride58
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
deathride58
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-Swenson
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 Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
WJohn
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
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00