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
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
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
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
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
513a15f463
Prevents grilles from magically regenerating ( #33357 )
2017-12-08 12:24:12 -06:00
bc4b689d56
Update medical.dm
2017-12-08 12:23:03 -05: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
315e1d718a
Adds pet carriers
2017-12-08 10:34:05 -06:00
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -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
3bff5f4cd6
Update PDA_types.dm
2017-12-05 17:43:52 -05:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
97c04d1430
Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
...
Fix uplink implants not working
2017-12-05 15:39:25 -06:00
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
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
6dded415b8
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
...
[MIRROR] Plushie relationships!
2017-12-04 21:32:16 +00: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
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
a575e2668d
Plasma statues get fixed ( #33224 )
...
* Plasma statues fix
* Actually a fix
* brackets
2017-12-03 13:16:45 -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
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
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
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05: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
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
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
deathride58