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

8168 Commits

Author SHA1 Message Date
LetterJay
b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767 
[MIRROR] Fix replace_random_law runtime
 2018-01-23 08:23:10 -06:00
LetterJay
acb333d403 Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765 
[MIRROR] Fixes APC controller runtime
 2018-01-23 08:22:56 -06:00
LetterJay
a7270f43cd Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750 
[MIRROR] current sanity check in ark of the justicar
 2018-01-23 08:21:10 -06:00
LetterJay
9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142 
[MIRROR] Refactors infrared beams to update faster
 2018-01-23 08:18:38 -06:00
LetterJay
ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810 
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
 2018-01-23 08:18:21 -06:00
LetterJay
54d4cdd8ab Merge pull request #5031 from Citadel-Station-13/upstream-merge-34725 
[MIRROR] Fixes portal storm event
 2018-01-23 08:17:33 -06:00
LetterJay
fa0823c27d Merge pull request #5030 from Citadel-Station-13/upstream-merge-34727 
[MIRROR] Stops simple_animals from attacking mobs in godmode
 2018-01-23 08:17:21 -06:00
LetterJay
75af3bc248 Merge pull request #5029 from Citadel-Station-13/upstream-merge-34742 
[MIRROR] Removes pulling claw instant messageless stun
 2018-01-23 08:17:09 -06:00
LetterJay
8ad54530a1 Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759 
[MIRROR] Consolidated t-ray scanner code
 2018-01-23 08:16:52 -06:00
oranges
58855df5dd Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law 
Fix replace_random_law runtime
 2018-01-23 01:43:00 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime 
Fixes APC controller runtime
 2018-01-23 01:42:43 -06:00
oranges
07b94d7bd9 Merge pull request #34750 from ShizCalev/clockwork-current- 
current sanity check in ark of the justicar
 2018-01-23 01:42:36 -06:00
kevinz000
ffaf6e2ba0 Infrared Refactor (#34142) 
bugfix: Infrared beams now update instantly.
 2018-01-23 01:32:28 -06:00
oranges
630d823d1a Merge pull request #34810 from tgstation/KorPhaeron-patch-2 
[s]Fixes being able to lower w_class of transfer valves
 2018-01-23 01:12:54 -06:00
ShizCalev
dfdf01e79e Fixes portal storm event (#34725) 2018-01-22 16:25:19 -06:00
Leo
8bdf83cc72 Merge pull request #34727 from ShizCalev/simpleanimal-godmode 
Stops simple_animals from attacking mobs in godmode
 2018-01-22 15:46:28 -06:00
kevinz000
54e9c47e99 Removes pulling claw instant messageless stun (#34742) 2018-01-22 15:45:15 -06:00
Cruix
23e5b7f396 Consolidated t-ray scanner code (#34759) 
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
 2018-01-22 15:45:07 -06:00
AnturK
1a85c90fab Adds transform helpers to atom vv (#34756) 2018-01-22 15:42:53 -06:00
deathride58
3f953220af Merge pull request #5023 from Citadel-Station-13/upstream-merge-34743 
[MIRROR] Changeling clothes blood fix
 2018-01-22 20:31:28 +00:00
deathride58
84385ee517 Merge pull request #5021 from Citadel-Station-13/upstream-merge-34734 
[MIRROR] Removes cultist space bases
 2018-01-22 20:31:05 +00:00
deathride58
f104c2c410 Merge pull request #5020 from Citadel-Station-13/upstream-merge-34704 
[MIRROR] Fixes syringe icons
 2018-01-22 20:30:52 +00:00
deathride58
6ddc7fe320 Merge pull request #5019 from Citadel-Station-13/upstream-merge-34707 
[MIRROR] flash_carbon() runtime fix
 2018-01-22 20:30:19 +00:00
deathride58
964281ef83 Merge pull request #5018 from Citadel-Station-13/upstream-merge-34726 
[MIRROR] Adds /area/asteroid/nearstation to GLOB.the_station_areas blacklist
 2018-01-22 20:30:02 +00:00
deathride58
5aad92cf11 Merge pull request #4948 from Citadel-Station-13/upstream-merge-34590 
[MIRROR] Fixes slimepeople not being able to open the bodyswap menu
 2018-01-22 20:29:46 +00:00
Emmett Gaines
e149fe390e Changeling clothes blood fix (#34743) 2018-01-22 13:08:07 -06:00
Iamgoofball
e862c1138e >people think burn victims are better than literally-cant-see-shit (#34734) 2018-01-22 13:06:32 -06:00
ShizCalev
fb86cf6878 Fixes syringe icons (#34704) 2018-01-22 12:01:02 -06:00
ShizCalev
a4b4c0c2de Fixes flash_carbon runtime (#34707) 2018-01-22 12:00:52 -06:00
ShizCalev
c0b4dd9cc5 Adds /area/asteroid/nearstation to blacklist (#34726) 2018-01-22 12:00:43 -06:00
LetterJay
8fcef30c56 Update jellypeople.dm 2018-01-22 07:36:43 -06:00
deathride58
fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667 
[MIRROR] Fixes slimes not attacking anybody
 2018-01-22 06:25:14 +00:00
deathride58
5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 
[MIRROR] Longer lasting candles.
 2018-01-22 06:24:35 +00:00
LetterJay
b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 
[MIRROR] Datum var cleanup
 2018-01-21 23:14:18 -06:00
LetterJay
e374b7f575 Merge pull request #5013 from Citadel-Station-13/upstream-merge-34636 
[MIRROR] Adds the camera and it's film to the autolathe and changes the materials on them
 2018-01-21 23:13:53 -06:00
LetterJay
fac7b08506 Merge pull request #5012 from Citadel-Station-13/upstream-merge-34705 
[MIRROR] Fix radio jammers affecting other z-levels
 2018-01-21 23:13:24 -06:00
LetterJay
e8ec0580d1 Merge pull request #5011 from Citadel-Station-13/upstream-merge-34697 
[MIRROR] Fixes holes in station showing up white on photos.
 2018-01-21 23:13:07 -06:00
LetterJay
61b0c699bf Merge pull request #5009 from Citadel-Station-13/upstream-merge-34712 
[MIRROR] Reduces spaces in the Lepidopterian language.
 2018-01-21 23:12:21 -06:00
LetterJay
f3e4ba69ec Merge pull request #5008 from Citadel-Station-13/upstream-merge-34711 
[MIRROR] Removes unused consts from dbcore
 2018-01-21 23:11:56 -06:00
LetterJay
e9e357d3de Merge pull request #5007 from Citadel-Station-13/upstream-merge-34709 
[MIRROR] Fixes each monkey having it's own individual monkey_team
 2018-01-21 23:11:37 -06:00
LetterJay
b1ee30d46e Merge pull request #5006 from Citadel-Station-13/upstream-merge-34714 
[MIRROR] Removes magic numbers from the set_light calls in light fixtures
 2018-01-21 23:11:20 -06:00
LetterJay
1beea71328 Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720 
[MIRROR] Syndicate+Pirate mobs now give off light if appropriate
 2018-01-21 23:10:57 -06:00
LetterJay
9a96950032 Merge pull request #5004 from Citadel-Station-13/upstream-merge-34723 
[MIRROR] City of cogs atmos is now planetary, slowly resets
 2018-01-21 23:10:35 -06:00
LetterJay
5aaba3c138 Merge pull request #5002 from Citadel-Station-13/upstream-merge-34715 
[MIRROR] Removes an unused proc
 2018-01-21 23:10:14 -06:00
LetterJay
6b998377ca Merge pull request #4996 from Citadel-Station-13/upstream-merge-34686 
[MIRROR] Ends the great monkey freezing epidemic
 2018-01-21 23:10:00 -06:00
LetterJay
84b9c4bb2b Update life.dm 2018-01-21 23:09:22 -06:00
LetterJay
61c245ebef Update candle.dm 2018-01-21 23:07:11 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
Dax Dupont
c2f5a85394 Adds the camera to the autolathe and changes the materials (#34636) 2018-01-21 21:24:18 -06:00
Tad Hardesty
4f33c20fba Fix radio jammers affecting other z-levels (#34705) 2018-01-21 21:18:00 -06:00