119129a80c
Adds force to items that really should hurt when hit by ( #32200 )
2017-10-29 18:49:48 -05:00
36893d3188
welder refuelling hotfix
2017-10-29 17:23:15 -05:00
ebef4e6607
Allows filling welders from open containers that have welding fuel in them ( #32143 )
...
🆑
tweak: You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.
/🆑
Closes #31339
2017-10-29 16:55:38 -05:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
819244575d
Spooky Spectral Instruments ( #31966 )
...
* [dooting intensifies]
Spectral Instruments added
To be used with Spooky Skeletons.
* Spectral Re-balance
The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.
* Requested Changes
Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.
* Loyalty text fix
* Spooky Trumpets
Removed comment.
Added missing spookiness.
* Spooky Dooting
Major Overhaul.
removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.
* Spooky Dooting
mk2
2017-10-29 07:35:16 -05:00
fd2705b6e6
Merge pull request #3667 from Citadel-Station-13/upstream-merge-32141
...
[MIRROR] Allows RPD to place pipes on catwalks/girders
2017-10-29 04:23:46 -04:00
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
d5856ad609
Allows RPD to place pipes on catwalks/girders ( #32141 )
...
* Allows RPD to place pipes on catwalks
* allows girders too
* fixes parenthesis
i sniff glue
2017-10-28 12:00:23 -05:00
4e4634649e
[MIRROR] [Review Again] Updates the cloning manual ( #3663 )
...
* [Review Again] Updates the cloning manual
* Update manuals.dm
2017-10-28 01:19:38 -07:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
985fdcd22d
Update clown_items.dm
2017-10-27 23:56:37 -05:00
08153b0fbb
Update misc.dm
2017-10-27 23:56:13 -05:00
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
141de52658
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
...
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
3ad1ac335f
Merge pull request #3623 from Citadel-Station-13/upstream-merge-31991
...
[MIRROR] fixes reflectors dropping extra mats
2017-10-27 02:43:35 -04:00
f268112af1
Merge pull request #3617 from Citadel-Station-13/upstream-merge-32019
...
[MIRROR] Fixes defib ghost prompt
2017-10-27 02:18:14 -04:00
3b82c26cb5
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
...
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
49fa09d1bd
Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944
...
[MIRROR] Atmos construction rework again
2017-10-27 02:00:11 -04:00
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
4cc0cf3ee7
Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
...
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
ef9c27ef0a
Roundstart species pref fixes/removes redundant species config
2017-10-26 12:00:56 -05:00
28053a603a
Merge pull request #31991 from ShizCalev/reflector-stack-fix
...
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
e92dec4e4c
Fixes defib ghost prompt ( #32019 )
...
* Fixes #32013
* proc instead.
2017-10-25 23:42:10 -05:00
ddbd1fcf85
--no-edit
2017-10-25 23:38:24 -05:00
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
927dea03ce
Fixes excessive overlay churn ( #32065 )
...
* Fixes excessive overlay chern
Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.
This is likely the cause of overlays being so high.
* I APOLOGIZE FOR NOTHING!
2017-10-25 21:45:46 -05:00
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05:00
00da8a2ead
Merge pull request #3575 from deathride58/mapsyncs1
...
Map Syncs - TG-gnawed-on-too-many-cables Edition
2017-10-23 23:02:23 -04:00
ed12370a73
Atmos construction rework again
2017-10-23 16:29:53 -05:00
fc07e15f61
Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992
...
[MIRROR] Fixes being unable to merge full stacks
2017-10-23 14:52:28 -04:00
c17d1dce40
Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948
...
[MIRROR] Fixes champrojector camera bugs
2017-10-23 14:50:34 -04:00
ce2f1cc672
Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981
...
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
2017-10-23 14:48:10 -04:00
23765d9ddd
Update stunbaton.dm
2017-10-23 13:17:35 -05:00
c1bd7bc6ba
Map syncs 1 - Code syncs
2017-10-23 12:56:26 -04:00
2c251f929f
Fixes being unable to merge full stacks ( #31992 )
2017-10-23 00:09:29 -05:00
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
10c2b8e672
I guess
2017-10-21 07:09:00 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
46a78bc3dd
[MIRROR] Reverts bluespace pipes ( #3513 )
...
* Revert bluespace pipes while keeping fixes from the original PR (#31866 )
These are absurdely overpowered given that they have no research or
material gate
* Reverts bluespace pipes
2017-10-20 01:40:15 -05:00
fe05d8aaaf
Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754
...
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
2017-10-19 09:24:04 -04:00
bgobandit