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

7926 Commits

Author SHA1 Message Date
deathride58
c7d3dd7e41 Merge pull request #4888 from Citadel-Station-13/upstream-merge-34322 
[MIRROR] Removes ash flora being harvested on roundstart
 2018-01-17 20:11:36 +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
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
0381765c81 Merge pull request #4883 from Citadel-Station-13/upstream-merge-34473 
[MIRROR] Nerfs techweb cargo points
 2018-01-17 09:39:54 -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
9fbbb018e8 Merge pull request #4879 from Citadel-Station-13/upstream-merge-34457 
[MIRROR] Combine and fix Show Air Status and Air Status in Location
 2018-01-17 09:36:56 -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
LetterJay
5329408366 Merge pull request #4880 from Citadel-Station-13/upstream-merge-34477 
[MIRROR] Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-17 09:36:20 -06:00
LetterJay
127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
oranges
ebdb8b1e16 Merge pull request #34322 from coiax/no-longer-harvested 
Removes ash flora being harvested on roundstart
 2018-01-16 14:36:13 -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
oranges
4a6b246b4c Merge pull request #34473 from kevinz000/techwebs_points 
Nerfs techweb cargo points
 2018-01-16 14:31:12 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
oranges
b128a28cf3 Merge pull request #34477 from tgstation/Cyberboss-patch-2 
Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-16 14:29:40 -06:00
oranges
9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status 
Combine and fix Show Air Status and Air Status in Location
 2018-01-16 14:29:29 -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
6bcd56a0f3 Merge pull request #4875 from Citadel-Station-13/upstream-merge-34482 
[MIRROR] Drone dispensers no longer trap the drones below them forcing ghosts to altclick
 2018-01-16 13:50:29 -06:00
LetterJay
36dd99b376 Merge pull request #4874 from Citadel-Station-13/upstream-merge-34505 
[MIRROR] Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 13:50:10 -06:00
LetterJay
df1e76aa5f Merge pull request #4873 from Citadel-Station-13/upstream-merge-34484 
[MIRROR] Ash storms are no longer so LOUD inside buildings.
 2018-01-16 13:49: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
fce1c1232a Merge pull request #4870 from Citadel-Station-13/upstream-merge-34315 
[MIRROR] Calling WEAKREF with a /datum/weakref returns the input
 2018-01-16 13:49:06 -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
LetterJay
01344aacdf Merge pull request #4868 from Citadel-Station-13/upstream-merge-34171 
[MIRROR] Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside.
 2018-01-16 13:48:40 -06:00
LetterJay
ba5d3c8938 Merge pull request #4867 from Citadel-Station-13/upstream-merge-34479 
[MIRROR] newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 13:48:26 -06:00
LetterJay
8b89832d76 Merge pull request #4864 from Citadel-Station-13/upstream-merge-34463 
[MIRROR] Fixes duplicate reagents in chemistry macros
 2018-01-16 13:47:50 -06:00
LetterJay
4f85c676b2 Merge pull request #4862 from Citadel-Station-13/upstream-merge-34455 
[MIRROR] Fixes shuttle console negative auths needed
 2018-01-16 13:47:22 -06:00
LetterJay
2f2b98c4eb Merge pull request #4861 from Citadel-Station-13/upstream-merge-34460 
[MIRROR] Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 13:47:10 -06:00
F-OS
3608165d7f Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482) 
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
 2018-01-16 08:45:16 -06:00
Jordan Brown
5e7e4c934d Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash 
Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 08:39:54 -06:00
Jordan Brown
b9e1d44aa4 Merge pull request #34484 from F-OS/patch-8 
Ash storms are no longer so LOUD inside buildings.
 2018-01-16 08:38:42 -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
9bd92eddf7 Calling WEAKREF with a /datum/weakref returns the input (#34315) 2018-01-16 08:34:03 -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
kevinz000
da30215a48 Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171) 
* Flash Refactor

* Update flash.dm

* Update flash.dm
 2018-01-16 08:30:36 -06:00
Jordan Brown
9df836baca Merge pull request #34479 from F-OS/patch-5 
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 08:29:24 -06:00
Jordan Brown
292fb13612 Merge pull request #34463 from DaedalusGame/micro_fix 
Fixes duplicate reagents in chemistry macros
 2018-01-16 07:40:47 -06:00
kevinz000
47c74443da Fixes negative auth coutns 2018-01-16 07:40:29 -06:00
Jordan Brown
7a3c222758 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo 
Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 07:39:14 -06:00