a0a4acbc2c
Update nuclear.dm
2017-12-19 17:33:55 -06:00
7d193a5303
Update wizard.dm
2017-12-19 15:35:57 -06:00
a30de42820
Update traitor.dm
2017-12-19 15:35:45 -06:00
2d65e0df49
Update nuclear.dm
2017-12-19 15:35:29 -06:00
61c7080c34
Update game_mode.dm
2017-12-19 15:34:59 -06:00
cb8c6cd5e2
Update changeling.dm
2017-12-19 15:34:38 -06:00
98d752fe21
Update traitor_bro.dm
2017-12-19 15:34:27 -06:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
ccd370328c
Merge branch 'master' into upstream-merge-33316
2017-12-11 00:01:02 +00:00
cdc23ad79e
Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265
...
[MIRROR] Good Clean Fun: A vending machine for games!
2017-12-10 23:50:05 +00:00
57ab98d8bc
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
...
[MIRROR] Airlock Construction Update
2017-12-10 23:49:51 +00:00
6e6b85c01a
Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276
...
[MIRROR] Restores the uplink modules, removes LoadComponents
2017-12-10 23:49:25 +00:00
6a8cffc3d5
Update implantuplink.dm
2017-12-10 18:03:04 -05:00
bfa573f4bd
Update alarmlock.dm
2017-12-10 17:46:50 -05:00
216b0931d1
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
...
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
a38ccf078b
Update borer.dm
2017-12-10 16:59:46 -05:00
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
4b0137d62e
Merge pull request #4308 from Citadel-Station-13/upstream-merge-33418
...
[MIRROR] Fixes booze-o-mats not having booze
2017-12-10 21:42:58 +00:00
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
d82698d106
Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280
...
[MIRROR] Add caltrop component for spikey floor objects
2017-12-10 14:20:40 -06:00
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
52da86e214
Fixes booze-o-mats not having booze ( #33418 )
...
* Update vending.dm
* Update vending.dm
* Update vending_items.dm
* Adds a missing close parenthisis
* I'm drunk and blind, don't sue me
* Update vending_items.dm
* Update vending_items.dm
2017-12-10 13:20:06 -06:00
9d59e36289
Add caltrop component for spikey floor objects ( #33280 )
...
* Add caltrop component for spikey floor objects
The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.
This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.
Also, it taught me how components work.
* Code review I
* Caltrop damage is 4
* Cactus hurts
* Whoops
* Ignore restraints = true
2017-12-10 10:32:03 -06:00
c59209a34f
Merge pull request #33392 from vuonojenmustaturska/patch-1
...
[s]Ghost altclick fix for pet carriers
2017-12-10 02:53:02 -06:00
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
70be12aa1c
Merge pull request #33241 from swindly/suicide
...
Adds some suicide acts
2017-12-09 15:52:53 -06:00
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
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
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
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
9715e9c685
Merge pull request #4232 from cebutris/borers
...
Removes borer event from rotation
2017-12-08 18:52:58 +00:00
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
665cef7a35
Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231
...
[MIRROR] Adds pet carriers
2017-12-08 18:46:07 +00:00
6c774d7798
Update mech_fabricator.dm
2017-12-08 13:43:33 -05:00
513a15f463
Prevents grilles from magically regenerating ( #33357 )
2017-12-08 12:24:12 -06:00
dfaa796fc2
Fixes certain material containers
2017-12-08 12:11:46 -06:00
bc4b689d56
Update medical.dm
2017-12-08 12:23:03 -05:00
d826217439
Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235
...
[MIRROR] Slime Blueprint Change
2017-12-08 17:18:22 +00:00
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
d619f206c6
Merge pull request #33235 from Fox-McCloud/xenobio-console
...
Slime Blueprint Change
2017-12-08 10:34:13 -06:00
315e1d718a
Adds pet carriers
2017-12-08 10:34:05 -06:00
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
6432d2c86c
Update slab_abilities.dm
2017-12-07 19:32:39 -05:00
f3fd81af24
Adds games vendor resupply crate
2017-12-06 22:53:21 -06:00
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
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
f37df9f0b5
Ghost defile removes salt piles ( #33294 )
...
Fixes #33291
2017-12-06 06:19:17 -06:00
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
1cc3e865bf
Good Clean Fun: A vending machine for games!
2017-12-05 17:20:21 -06:00
LetterJay