deathride58
71c3a8266a
Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424
...
[MIRROR] Standardization of return_ordered_turfs
2017-12-11 00:06:54 +00:00
deathride58
c211552c9d
Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309
...
[MIRROR] Silver slime extract foods now fry correctly
2017-12-11 00:03:05 +00:00
deathride58
d6573f602d
Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148
...
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 23:50:20 +00:00
deathride58
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
deathride58
57ab98d8bc
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
...
[MIRROR] Airlock Construction Update
2017-12-10 23:49:51 +00:00
deathride58
c116054efc
Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361
...
[MIRROR] Removes juicers
2017-12-10 23:49:41 +00:00
deathride58
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
Emmett Gaines
35e8cc3e22
minor improvements ( #33424 )
2017-12-10 17:44:31 -06:00
coiax
6846e87ae2
Silver slime extract foods now fry correctly ( #33309 )
...
* Silver slime extract foods now fry correctly
The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.
- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.
* Contains
2017-12-10 17:42:20 -06:00
LetterJay
85578cae0d
Merge pull request #4316 from deathride58/iconoverridefix
...
Fixes icon_override only applying to uniforms
2017-12-10 17:15:13 -06:00
deathride58
e46e6dcd1a
Delete juicer.dm
2017-12-10 18:06:19 -05:00
deathride58
0475ef46f7
Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150
...
[MIRROR] Makes actionbuttons remember positions where you locked them.
2017-12-10 23:04:34 +00:00
deathride58
1eb0e42bb1
Update uplink_devices.dm
2017-12-10 18:04:11 -05:00
deathride58
6a8cffc3d5
Update implantuplink.dm
2017-12-10 18:03:04 -05:00
deathride58
68d7347c02
Update white_ship.dm
2017-12-10 17:55:46 -05:00
deathride58
bfa573f4bd
Update alarmlock.dm
2017-12-10 17:46:50 -05:00
deathride58
01c9cf6479
Update preferences.dm
2017-12-10 17:45:21 -05:00
deathride58
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
deathride58
94d0293703
Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413
...
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
2017-12-10 22:39:02 +00:00
deathride58
2a481e69df
Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400
...
[MIRROR] Fix catch all blackbox vv guard
2017-12-10 22:36:09 +00:00
deathride58
fd3b0c72de
Update say.dm
2017-12-10 17:01:50 -05:00
deathride58
a38ccf078b
Update borer.dm
2017-12-10 16:59:46 -05:00
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
deathride58
b66e664f11
Merge pull request #4309 from Citadel-Station-13/upstream-merge-33415
...
[MIRROR] Improves the way chem machines handle qdel, fixes some runtimes
2017-12-10 21:45:01 +00:00
deathride58
fa42a336f3
Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320
...
[MIRROR] Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 21:44:34 +00:00
deathride58
1a8dd315f9
Merge pull request #4306 from Citadel-Station-13/upstream-merge-33391
...
[MIRROR] Fixes butchered cats not dropping their ears and tails
2017-12-10 21:43:59 +00:00
deathride58
215a8f47ed
Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423
...
[MIRROR] Undelaying roundend will now reboot the server normally.
2017-12-10 21:43:26 +00:00
deathride58
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
deathride58
57b6c893ff
Merge pull request #4312 from Citadel-Station-13/upstream-merge-33279
...
[MIRROR] Standardizes false report weighting
2017-12-10 21:42:19 +00:00
deathride58
85ccdac4d7
fixes icon_override only applying to uniforms
2017-12-10 16:37:28 -05:00
uraniummeltdown
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
oranges
30143ee601
Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
...
[READY]Fixes beam rifles and flightsuits
2017-12-10 15:19:18 -06:00
Cruix
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
LetterJay
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
LetterJay
336b02e2ba
Merge pull request #4301 from Citadel-Station-13/upstream-merge-33396
...
[MIRROR] Fixes tooltip offsets
2017-12-10 14:20:32 -06:00
LetterJay
d1074cc29b
Merge pull request #4300 from Citadel-Station-13/upstream-merge-33392
...
[MIRROR] [s]Ghost altclick fix for pet carriers
2017-12-10 14:20:23 -06:00
LetterJay
de13c6c799
Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395
...
[MIRROR] switches lobes for grammar n shit
2017-12-10 14:20:02 -06:00
LetterJay
563517ab4a
Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378
...
[MIRROR] Makes godwoken syndrome a bit more reliable
2017-12-10 14:19:51 -06:00
oranges
4dbac00348
Merge pull request #33279 from Robustin/Reported
...
Standardizes false report weighting
2017-12-10 14:15:50 -06:00
oranges
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
oranges
38da8cb545
Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings
...
Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 14:08:21 -06:00
ACCount
fd6a386779
Improves the way chem machines handle qdel, fixes some runtimes ( #33415 )
2017-12-10 13:25:21 -06:00
Anonmare
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
Jordan Brown
309a936c5f
Fix catch all blackbox vv guard ( #33400 )
2017-12-10 13:03:40 -06:00
jughu
d5472ab6e4
ha ( #33391 )
2017-12-10 13:03:30 -06:00
Tad Hardesty
41b0dbe36f
Fix MULEbot id numbers showing nowhere but the alt-click menu ( #33413 )
2017-12-10 12:55:12 -06:00
AnturK
030812035f
Undelaying will now reboot the server normally. ( #33423 )
2017-12-10 12:54:02 -06:00
coiax
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
Jordan Brown
96a2a7700d
Merge pull request #33396 from AnturK/tooltip-fix
...
Fixes tooltip offsets
2017-12-10 10:26:44 -06:00
oranges
c59209a34f
Merge pull request #33392 from vuonojenmustaturska/patch-1
...
[s]Ghost altclick fix for pet carriers
2017-12-10 02:53:02 -06:00
