Mercenaryblue
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
PKPenguin321
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
CitadelStationBot
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
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
985fdcd22d
Update clown_items.dm
2017-10-27 23:56:37 -05:00
Jordan Brown
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
LetterJay
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
LetterJay
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
LetterJay
3b82c26cb5
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
...
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
LetterJay
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
as334
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
KorPhaeron
ef9c27ef0a
Roundstart species pref fixes/removes redundant species config
2017-10-26 12:00:56 -05:00
ShizCalev
e92dec4e4c
Fixes defib ghost prompt ( #32019 )
...
* Fixes #32013
* proc instead.
2017-10-25 23:42:10 -05:00
Jordan Brown
ddbd1fcf85
--no-edit
2017-10-25 23:38:24 -05:00
Emmett Gaines
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
kevinz000
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05:00
duncathan salt
ed12370a73
Atmos construction rework again
2017-10-23 16:29:53 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
23765d9ddd
Update stunbaton.dm
2017-10-23 13:17:35 -05:00
YPOQ
2c251f929f
Fixes being unable to merge full stacks ( #31992 )
2017-10-23 00:09:29 -05:00
MoreRobustThanYou
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
vuonojenmustaturska
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
Firecage
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
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
CitadelStationBot
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
LetterJay
9076721384
Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
...
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
Leo
29e20a55de
Merge pull request #31842 from GunHog/GPS_Name_Fix
...
GPS renaming fix
2017-10-18 07:23:31 -05:00
Leo
060d43768e
Merge pull request #31836 from AnturK/pdalogfix
...
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
LetterJay
250f55e072
Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
...
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJay
92fa0ca960
Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809
...
[MIRROR] Cleans up some istypes not using helpers
2017-10-18 07:37:43 -04:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
Leo
28656d3347
Merge pull request #31809 from ShizCalev/helper-cleanup
...
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
ShizCalev
bcb077a526
Fixes slapper inhand ( #31793 )
2017-10-17 13:36:17 -05:00
LetterJay
d6daa8b3e9
Merge pull request #3454 from Citadel-Station-13/upstream-merge-31699
...
[MIRROR] Increasew the size of the katana from normal to huge
2017-10-17 08:59:20 -04:00
LetterJay
db421c0f6b
Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972
...
[MIRROR] Atmospherics Multilayer Pipes
2017-10-17 08:58:10 -04:00
LetterJay
3f339a9908
Merge pull request #3444 from Citadel-Station-13/upstream-merge-31742
...
[MIRROR] Removes a misleading message when handling full stacks of sheets.
2017-10-17 08:55:33 -04:00
oranges
baae0dcd15
Merge pull request #31699 from jughu/Misc
...
Increasew the size of the katana from normal to huge
2017-10-17 03:49:58 -05:00
kevinz000
a41725a955
Atmospherics Multilayer Pipes ( #30972 )
...
* 1
* rpd
* 3
* 4
* 5
* 6
* 7
* 8
* wew
* src. and underlays
* update
* woops
* misspelled params
* reviews
* fixes
* fixes
* better checks and layer crap
* Update RPD.dm
* Update pipe_construction.dm
* 3 layers, fixes
* woops i didn't update defines correctly
* dunc
* Fixes
* Fixes
* fixes
* fixes some more bullshit
* fixes
* fixes
* not needed
* makes attachment sprites prettier or uglier i dunno
* Unary flag
* sprite fix??
* fixes...
* sprite fixes
2017-10-17 00:49:12 -05:00
vuonojenmustaturska
6e1ef37f10
stops message spam ( #31742 )
2017-10-16 16:48:45 -05:00
KorPhaeron
74c6e7e23f
Fixes godhand having no inhand sprite ( #31744 )
...
* Fixes godhand having no inhand
* Correct file paths
2017-10-16 14:34:11 -05:00
