Commit Graph

6518 Commits

Author SHA1 Message Date
deathride58 2f42366856 Merge pull request #4158 from Citadel-Station-13/upstream-merge-33109
[MIRROR] Cancels camera view on teleport
2017-11-29 03:25:46 +00:00
deathride58 5fdba02717 Merge pull request #4156 from Citadel-Station-13/upstream-merge-33126
[MIRROR] Fixes projectiles not getting range on ricochets
2017-11-29 03:25:18 +00:00
deathride58 0560a94824 Merge pull request #4154 from Citadel-Station-13/upstream-merge-33122
[MIRROR] Moves pipe meter sprites
2017-11-29 03:21:45 +00:00
deathride58 1e657d9f61 Merge pull request #4153 from Citadel-Station-13/upstream-merge-33121
[MIRROR] Removes some unused sprite files
2017-11-29 03:21:30 +00:00
Jordan Brown cfb7749903 Merge pull request #33109 from ShizCalev/camera-teleport
Cancels camera view on teleport
2017-11-28 06:29:05 -06:00
kevinz000 9c93d8ef4c fixes ricochets not resetting range 2017-11-28 06:28:47 -06:00
ACCount d883ec3114 Moves pipe meter sprites (#33122) 2017-11-28 06:28:31 -06:00
ACCount b15481c7cd Removes some unused sprite files (#33121)
* Removes two unused sprite files

* Removes two more sprites
2017-11-28 06:28:23 -06:00
JJRcop cd7cbc7f59 Fixes VV Make Space Ninja verb (#32982) 2017-11-28 06:27:45 -06:00
deathride58 e0aaed6d3b Merge pull request #4148 from Citadel-Station-13/upstream-merge-33086
[MIRROR] Fixed a rare custom shuttle docker client crash
2017-11-27 20:40:36 +00:00
deathride58 b9921b45bf Merge pull request #4147 from Citadel-Station-13/upstream-merge-33072
[MIRROR] Fixes non-advanced diseases vaccines.
2017-11-27 20:40:01 +00:00
deathride58 c8022e2764 Merge pull request #4145 from Citadel-Station-13/upstream-merge-33099
[MIRROR] Allows toolbelts to carry geiger counters
2017-11-27 20:39:35 +00:00
deathride58 8d18140e02 Merge pull request #4144 from Citadel-Station-13/upstream-merge-33081
[MIRROR] Stack Recipe Lists
2017-11-27 20:39:02 +00:00
Cruix e9f307af8e Fixed a rare custom shuttle docker client crash (#33086) 2017-11-27 11:46:32 -06:00
Leo 00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook
Fixes non-advanced diseases vaccines.
2017-11-27 08:25:55 -06:00
Leo 5b45f66677 Merge pull request #33099 from jughu/Powercreep-till-the-end
Allows toolbelts to carry geiger counters
2017-11-27 08:20:18 -06:00
uraniummeltdown 2d0f8d9482 Stack Recipe Lists (#33081)
* ports baycode stack_recipe_list
comfy and office chairs use stack recipe lists

* removed some src. and made list_recipes() into interact()

* /datum/browser for stack menus

* revert unnecessary edit
2017-11-27 06:17:18 -06:00
vuonojenmustaturska f685f4bd1a Removes one source of decal/cleanable qdel failures (#33083)
* remove one source of qdel memes

* pls

* A housekeeping thing for the ignore list, also removes effectively unused var

* whoops
2017-11-27 05:30:08 -06:00
deathride58 952c25ff6e Merge pull request #4128 from Citadel-Station-13/upstream-merge-33065
[MIRROR] Fixes rdconsole emagging
2017-11-27 05:19:49 +00:00
deathride58 2e708d49c2 Merge pull request #4123 from Citadel-Station-13/upstream-merge-32993
[MIRROR] A few investigate_log and message_admin fixes
2017-11-27 05:18:12 +00:00
deathride58 9e0aac69f3 Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034
[MIRROR] More integrated circuit fixes and code improvements
2017-11-27 05:17:50 +00:00
deathride58 edd2b25a1d Merge pull request #4138 from Citadel-Station-13/upstream-merge-33079
[MIRROR] Splits mutations from mutations.dm into a subfolder, /datums/mutations
2017-11-27 05:17:21 +00:00
deathride58 1d8618eaca Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
deathride58 0fcc60a984 Merge pull request #4114 from Citadel-Station-13/kevinz000-patch-2
Magrifle/magpistol rebalancing - More ammo, faster speed, slightly less spread, less stamina damage
2017-11-27 02:44:02 +00:00
deathride58 424ba669f1 Update protolathe.dm 2017-11-26 21:40:14 -05:00
deathride58 90691c68d0 Update rdconsole.dm 2017-11-26 21:39:40 -05:00
deathride58 61521990e2 Update circuitprinter.dm 2017-11-26 21:39:11 -05:00
deathride58 c4b3b99c99 Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087
[MIRROR] Cleans up some qdel(src)'s in Initialize()
2017-11-27 02:37:07 +00:00
deathride58 c9211bca16 Update multitool.dm 2017-11-26 21:36:10 -05:00
deathride58 c9f0f4923f Update rdconsole.dm 2017-11-26 21:34:09 -05:00
deathride58 1d50248da3 Update hulk.dm 2017-11-26 21:29:20 -05:00
deathride58 940f70ff5f Update mutations.dm 2017-11-26 21:28:35 -05:00
deathride58 d5eef89e13 Update parrot.dm 2017-11-26 21:26:35 -05:00
deathride58 12cb0a98a4 Update headcrab.dm 2017-11-26 21:25:51 -05:00
deathride58 90e13d0053 Update creature.dm 2017-11-26 21:25:13 -05:00
deathride58 e5e17cf334 Update bear.dm 2017-11-26 21:24:27 -05:00
deathride58 c67063beb5 Update lizard.dm 2017-11-26 21:23:50 -05:00
deathride58 e70daa585c Update fox.dm 2017-11-26 21:23:26 -05:00
deathride58 eb13f4ee2f Update farm_animals.dm 2017-11-26 21:22:42 -05:00
deathride58 933b4a7a3a Update crab.dm 2017-11-26 21:21:55 -05:00
deathride58 4e2db63a33 Update cat.dm 2017-11-26 21:21:28 -05:00
deathride58 59b8731370 Update misc.dm 2017-11-26 21:20:54 -05:00
deathride58 9538aa645c Update bombspawner.dm 2017-11-26 21:20:00 -05:00
deathride58 540a4eac5d Merge pull request #4140 from Citadel-Station-13/upstream-merge-33088
[MIRROR] Fixes wizard greentext
2017-11-27 02:19:02 +00:00
deathride58 d765fc49e7 Merge pull request #4135 from Citadel-Station-13/upstream-merge-33080
[MIRROR] Oldstation edits/fixes
2017-11-27 02:18:47 +00:00
ShizCalev 5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
AnturK c574b06f90 Fixes wizard greentext (#33088) 2017-11-26 16:53:58 -06:00
ShizCalev 4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
Ashe Higgs 6c553d17a4 Splits mutations from mutations.dm into a subfolder, /datums/mutations 2017-11-26 14:54:13 -06:00
kevinz000 794a793b27 Fixes latejoins (#33096)
length() is 0 on null lists.

Update job.dm
2017-11-26 05:11:09 -06:00