 deathride58
|
6ef12d993b
|
Merge pull request #4289 from Citadel-Station-13/upstream-merge-33263
[MIRROR] People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
|
2017-12-10 03:09:28 +00:00 |
|
|
Jordan Brown
|
70be12aa1c
|
Merge pull request #33241 from swindly/suicide
Adds some suicide acts
|
2017-12-09 15:52:53 -06:00 |
|
|
Jordan Brown
|
00c17ad6e5
|
Merge pull request #33263 from kevinz000/patch-402
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
|
2017-12-09 15:52:35 -06:00 |
|
|
deathride58
|
742d50b5e7
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
|
2017-12-08 19:58:41 -05:00 |
|
|
deathride58
|
7ca945c96b
|
Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370
[MIRROR] Fixes certain material containers
|
2017-12-08 19:35:43 +00:00 |
|
|
deathride58
|
0c8bdab295
|
Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357
[MIRROR] Prevents (cat)grilles from magically regenerating.
|
2017-12-08 19:06:46 +00:00 |
|
|
deathride58
|
9715e9c685
|
Merge pull request #4232 from cebutris/borers
Removes borer event from rotation
|
2017-12-08 18:52:58 +00:00 |
|
|
deathride58
|
53ab4feb2f
|
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
|
2017-12-08 18:47:56 +00:00 |
|
|
deathride58
|
665cef7a35
|
Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231
[MIRROR] Adds pet carriers
|
2017-12-08 18:46:07 +00:00 |
|
|
deathride58
|
6c774d7798
|
Update mech_fabricator.dm
|
2017-12-08 13:43:33 -05:00 |
|
|
Dax Dupont
|
513a15f463
|
Prevents grilles from magically regenerating (#33357)
|
2017-12-08 12:24:12 -06:00 |
|
|
Jordan Brown
|
dfaa796fc2
|
Fixes certain material containers
|
2017-12-08 12:11:46 -06:00 |
|
|
deathride58
|
bc4b689d56
|
Update medical.dm
|
2017-12-08 12:23:03 -05:00 |
|
|
deathride58
|
d826217439
|
Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235
[MIRROR] Slime Blueprint Change
|
2017-12-08 17:18:22 +00:00 |
|
|
Jordan Brown
|
8b9e15d1b5
|
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
|
2017-12-08 10:35:23 -06:00 |
|
|
oranges
|
d619f206c6
|
Merge pull request #33235 from Fox-McCloud/xenobio-console
Slime Blueprint Change
|
2017-12-08 10:34:13 -06:00 |
|
|
Ashe Higgs
|
315e1d718a
|
Adds pet carriers
|
2017-12-08 10:34:05 -06:00 |
|
|
AnturK
|
e1fece081f
|
Limit bullet overlays on walls (#33364)
* Limit bullet overlays on walls
* Whitespace bad
* Okay
* Touching this because I'm testing TGS3 stuff
* Update walls.dm
|
2017-12-08 10:33:39 -06:00 |
|
|
Jordan Brown
|
8f71b88a87
|
Merge pull request #33318 from AutomaticFrenzy/patch/vendor
Fix vending machines nullspacing every item on init
|
2017-12-06 22:48:42 -06:00 |
|
|
Trevor Serpas
|
f37df9f0b5
|
Ghost defile removes salt piles (#33294)
Fixes #33291
|
2017-12-06 06:19:17 -06:00 |
|
|
deathride58
|
c1cd970cc4
|
Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274
[MIRROR] Removes ComponentActivated in favor of callbacks
|
2017-12-06 03:53:35 +00:00 |
|
|
deathride58
|
3bff5f4cd6
|
Update PDA_types.dm
|
2017-12-05 17:43:52 -05:00 |
|
|
deathride58
|
cf23ed4e14
|
Update mech_fabricator.dm
|
2017-12-05 17:42:56 -05:00 |
|
|
deathride58
|
61ff2269ae
|
Merge pull request #4237 from Citadel-Station-13/upstream-merge-33270
[MIRROR] Removes bad comment. Makes check saner
|
2017-12-05 22:41:25 +00:00 |
|
|
deathride58
|
6951e3a6f6
|
Merge pull request #4235 from Citadel-Station-13/upstream-merge-33259
[MIRROR] Reverts sound range and falloff so as to not carry as far
|
2017-12-05 22:41:01 +00:00 |
|
|
deathride58
|
2716770f92
|
Merge pull request #4234 from Citadel-Station-13/upstream-merge-33262
[MIRROR] Fix uplink implants not working
|
2017-12-05 22:40:39 +00:00 |
|
|
Jordan Brown
|
efa0855858
|
Removes bad comment. Makes check saner (#33270)
|
2017-12-05 15:50:08 -06:00 |
|
|
Jordan Brown
|
e1f658a50d
|
Removes ComponentActivated in favor of callbacks
|
2017-12-05 15:42:47 -06:00 |
|
|
Robustin
|
1490c56d22
|
Reverts sound range and falloff so as to not carry as far (#33259)
* Reverts triple sound range
* Reverts sound falloff
|
2017-12-05 15:41:36 -06:00 |
|
|
Leo
|
97c04d1430
|
Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
Fix uplink implants not working
|
2017-12-05 15:39:25 -06:00 |
|
|
Jordan Brown
|
d37e2a3363
|
Fix some unquoted list associations (#33290)
|
2017-12-05 15:31:05 -06:00 |
|
|
cebutris
|
50a4f85cbb
|
removes it even harder
|
2017-12-05 16:03:03 -05:00 |
|
|
cebutris
|
701108d074
|
removes borer event from rotation
|
2017-12-05 15:56:23 -05:00 |
|
|
deathride58
|
a6aa181161
|
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
[MIRROR] Moves some machine sprites into /machines/ folder
|
2017-12-05 20:37:30 +00:00 |
|
|
ACCount
|
435e46e407
|
Moves some machine sprites into /machines/ folder
|
2017-12-05 03:24:03 -06:00 |
|
|
oranges
|
4204c889ed
|
Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
|
2017-12-05 03:23:06 -06:00 |
|
|
deathride58
|
f57e02ce95
|
Merge branch 'master' into donoritemmodularization
|
2017-12-04 20:17:02 -05:00 |
|
|
deathride58
|
379f73d1e1
|
Merge branch 'master' into upstream-merge-32249
|
2017-12-04 23:15:38 +00:00 |
|
|
deathride58
|
858a9bf428
|
Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624
[MIRROR] [READY]Refactors uplinks to a component!
|
2017-12-04 23:12:45 +00:00 |
|
|
deathride58
|
21d5e8999c
|
Merge branch 'master' into upstream-merge-32624
|
2017-12-04 17:12:53 -05:00 |
|
|
deathride58
|
64aadb868e
|
Merge branch 'master' into upstream-merge-33213
|
2017-12-04 21:39:30 +00:00 |
|
|
deathride58
|
6dded415b8
|
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
[MIRROR] Plushie relationships!
|
2017-12-04 21:32:16 +00:00 |
|
|
deathride58
|
4ddbe28068
|
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
[MIRROR] Holorecord disks.
|
2017-12-04 21:29:44 +00:00 |
|
|
deathride58
|
1a32bdc053
|
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
[MIRROR] Datumizes saymodes
|
2017-12-04 21:19:53 +00:00 |
|
|
deathride58
|
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 |
|
|
deathride58
|
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 |
|
|
AnturK
|
2587b99a69
|
Adds quiet argument to playsound. (#33185)
* Adds quiet argument to playsound.
* argument name change
|
2017-12-04 05:28:43 -06:00 |
|
|
AnturK
|
1cc3e33714
|
Holorecord disks.
|
2017-12-04 05:14:13 -06:00 |
|
|
Ashe Higgs
|
3689b3d5fd
|
Mechs now require fuel to repair (#33225)
|
2017-12-04 04:55:25 -06:00 |
|
|
Jordan Brown
|
2393b7759b
|
People jitter when revived by defibs
|
2017-12-03 20:19:44 -06:00 |
|