64aadb868e
Merge branch 'master' into upstream-merge-33213
2017-12-04 21:39:30 +00:00
6dded415b8
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
...
[MIRROR] Plushie relationships!
2017-12-04 21:32:16 +00:00
4ddbe28068
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
...
[MIRROR] Holorecord disks.
2017-12-04 21:29:44 +00:00
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
ca14e25639
Merge pull request #4210 from Citadel-Station-13/upstream-merge-33185
...
[MIRROR] Adds quiet argument to playsound.
2017-12-04 21:09:24 +00:00
9d87f5fd9f
Merge pull request #4207 from Citadel-Station-13/upstream-merge-33225
...
[MIRROR] Fixes mechs needing no fuel to repair, and tweaks repair messages
2017-12-04 21:07:25 +00:00
2587b99a69
Adds quiet argument to playsound. ( #33185 )
...
* Adds quiet argument to playsound.
* argument name change
2017-12-04 05:28:43 -06:00
1cc3e33714
Holorecord disks.
2017-12-04 05:14:13 -06:00
3689b3d5fd
Mechs now require fuel to repair ( #33225 )
2017-12-04 04:55:25 -06:00
2393b7759b
People jitter when revived by defibs
2017-12-03 20:19:44 -06:00
d9ca1d6831
Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224
...
[MIRROR] Plasma statues get fixed
2017-12-03 23:30:01 +00:00
51f07eb65a
Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189
...
[MIRROR] Fixes spelling error in opened cryogenic pods.
2017-12-03 23:21:28 +00:00
a575e2668d
Plasma statues get fixed ( #33224 )
...
* Plasma statues fix
* Actually a fix
* brackets
2017-12-03 13:16:45 -06:00
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -06:00
6217206bae
Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180
...
[MIRROR] cardboard no longer can damage you
2017-12-03 06:16:00 -06:00
c5f0b380cd
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
...
[MIRROR] Clean up some loc assignments
2017-12-03 06:14:34 -06:00
b2f1359795
Merge pull request #4185 from Citadel-Station-13/upstream-merge-33197
...
[MIRROR] Fixes syndieborg spawner
2017-12-03 06:14:25 -06:00
dd99e8305a
Update plushes.dm
2017-12-03 06:14:14 -06:00
8017aac116
Fixes spelling error in opened cryogenic pods. ( #33189 )
2017-12-02 09:45:07 -06:00
4723a1813b
Merge pull request #33180 from praisenarsie/patch-13
...
cardboard no longer can damage you
2017-12-02 09:44:47 -06:00
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -06:00
18c01d88c5
Fixes syndieborg spawner
2017-12-02 09:44:11 -06:00
7be54897b2
Plushie relationships!
2017-12-02 09:44:02 -06:00
786c26fa97
Ratvar will now bitchslap BOH babies ( #33159 )
...
* Singuloproofing Reebe
* Message reformatted
* Inconsistent Indentification
* user is now living so we can knock them down
2017-12-01 11:58:30 -06:00
834102c7d5
Merge pull request #4169 from Citadel-Station-13/upstream-merge-33149
...
[MIRROR] Removes an unused proc
2017-12-01 02:02:11 +00:00
d19c41cf64
Do this ( #33149 )
2017-11-30 17:01:20 -06:00
6d8d9802d4
Merge pull request #33153 from AnturK/adv_cam_cleanup
...
Fixes some advanced camera issues
2017-11-30 17:00:46 -06:00
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
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
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
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
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
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
5e2ca3235d
Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
...
[MIRROR] Fixes devilstuff
2017-11-29 03:26:51 +00:00
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
5bc059fbc8
Update artefact.dm ( #33129 )
...
Beep Beep more hard to get suicides are fun!
2017-11-28 19:06:24 -06:00
47e0943c9c
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 19:04:09 -06:00
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -06:00
87c16e3939
Merge pull request #33112 from AnturK/devilfix
...
Fixes devilstuff
2017-11-28 06:29:25 -06:00
89d3e37e1a
Merge pull request #33140 from Wad67/master
...
Check door for (welded) upon closing
2017-11-28 06:29:17 -06:00
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
b15481c7cd
Removes some unused sprite files ( #33121 )
...
* Removes two unused sprite files
* Removes two more sprites
2017-11-28 06:28:23 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
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
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
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
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
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
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