Commit Graph
9648 Commits
Author SHA1 Message Date
deathride58andGitHub 32f694943b Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
CitadelStationBot dc57555410 Automatic changelog generation for PR #4133 [ci skip] 2017-11-29 22:43:54 -06:00
deathride58andGitHub 6ac2a8c9a0 Merge pull request #4133 from Citadel-Station-13/upstream-merge-32432
[MIRROR] [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms
2017-11-30 04:43:51 +00:00
CitadelStationBot 008588bd91 Automatic changelog generation for PR #4155 [ci skip] 2017-11-29 22:34:29 -06:00
deathride58andGitHub 4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
[MIRROR] Added bot path data huds
2017-11-30 04:34:25 +00:00
deathride58andGitHub e06b368fdb Update medical_designs.dm 2017-11-28 22:32:23 -05:00
deathride58andGitHub 9458087cfa Update scanners.dm 2017-11-28 22:31:54 -05:00
deathride58andGitHub 34c9105396 Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129
[MIRROR] Adds a new wizard magic suicide.
2017-11-29 03:29:37 +00:00
deathride58andGitHub 6c6149e1af Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
2017-11-29 03:29:17 +00:00
deathride58andGitHub 0e77256e81 Merge pull request #4163 from Citadel-Station-13/upstream-merge-33138
[MIRROR] Fixes piano in the big band music crate
2017-11-29 03:28:53 +00:00
CitadelStationBot a850dbf56d Automatic changelog generation for PR #4162 [ci skip] 2017-11-28 21:28:07 -06:00
deathride58andGitHub 7a5a02939c Merge pull request #4162 from Citadel-Station-13/upstream-merge-33131
[MIRROR] Makes the sloth an actual sloth
2017-11-29 03:28:04 +00:00
deathride58andGitHub 5e2ca3235d Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
[MIRROR] Fixes devilstuff
2017-11-29 03:26:51 +00:00
deathride58andGitHub 3f29fb59e1 Merge pull request #4159 from Citadel-Station-13/upstream-merge-33140
[MIRROR] Check door for (welded) upon closing
2017-11-29 03:26:03 +00:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 507c862c7c Update hud.dm 2017-11-28 22:24:00 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
CitadelStationBot 41c5e634a6 Automatic changelog generation for PR #4149 [ci skip] 2017-11-28 21:19:49 -06:00
deathride58andGitHub 8059f70f8f Merge pull request #4149 from Citadel-Station-13/upstream-merge-32982
[MIRROR] Fixes VV Make Space Ninja verb
2017-11-29 03:19:46 +00:00
deathride58andGitHub 4ff2063a4a Update sloth.dm 2017-11-28 22:19:08 -05:00
CitadelStationBot 9f1946e68b Adds a new wizard magic suicide. 2017-11-28 19:06:24 -06:00
Shadowflame909andCitadelStationBot 5bc059fbc8 Update artefact.dm (#33129)
Beep Beep more hard to get suicides are fun!
2017-11-28 19:06:24 -06:00
CitadelStationBot 88f8c955ca Fixes twohanded weapons showing outdated icons when equipped to the back 2017-11-28 19:04:09 -06:00
ShizCalevandCitadelStationBot 47e0943c9c Fixes twohanded weapons showing outdated icons (#33127) 2017-11-28 19:04:09 -06:00
CitadelStationBot 32b1bdbb44 Fixes piano in the big band music crate 2017-11-28 19:02:54 -06:00
ShizCalevandCitadelStationBot 48c66093fc Fixes big band music crate (#33138) 2017-11-28 19:02:54 -06:00
Kyle Spier-SwensonandCitadelStationBot ad135a57a3 Makes the sloth an actual sloth 2017-11-28 19:02:45 -06:00
CitadelStationBot 4845ed033a Fixes devilstuff 2017-11-28 06:29:25 -06:00
Jordan BrownandCitadelStationBot 87c16e3939 Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
2017-11-28 06:29:25 -06:00
CitadelStationBot 423f07bcb9 Check door for (welded) upon closing 2017-11-28 06:29:17 -06:00
Jordan BrownandCitadelStationBot 89d3e37e1a Merge pull request #33140 from Wad67/master
Check door for (welded) upon closing
2017-11-28 06:29:17 -06:00
CitadelStationBot db2f89b741 Cancels camera view on teleport 2017-11-28 06:29:05 -06:00
Jordan BrownandCitadelStationBot cfb7749903 Merge pull request #33109 from ShizCalev/camera-teleport
Cancels camera view on teleport
2017-11-28 06:29:05 -06:00
CitadelStationBot d4f98c2780 Fixes projectiles not getting range on ricochets 2017-11-28 06:28:48 -06:00
kevinz000andCitadelStationBot 9c93d8ef4c fixes ricochets not resetting range 2017-11-28 06:28:47 -06:00
CruixandCitadelStationBot b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
CitadelStationBot 7f5d673026 Moves pipe meter sprites 2017-11-28 06:28:32 -06:00
ACCountandCitadelStationBot d883ec3114 Moves pipe meter sprites (#33122) 2017-11-28 06:28:31 -06:00
CitadelStationBot 2ea0ac673c Removes some unused sprite files 2017-11-28 06:28:23 -06:00
ACCountandCitadelStationBot b15481c7cd Removes some unused sprite files (#33121)
* Removes two unused sprite files

* Removes two more sprites
2017-11-28 06:28:23 -06:00
ACCountandCitadelStationBot f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
CitadelStationBot 22a8b4dc92 Fixes VV Make Space Ninja verb 2017-11-28 06:27:45 -06:00
JJRcopandCitadelStationBot cd7cbc7f59 Fixes VV Make Space Ninja verb (#32982) 2017-11-28 06:27:45 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
CitadelStationBot a52f5a425b Automatic changelog generation for PR #4145 [ci skip] 2017-11-27 14:39:38 -06:00
deathride58andGitHub 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
CitadelStationBot 0443417430 Automatic changelog generation for PR #4144 [ci skip] 2017-11-27 14:39:05 -06:00