shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,317 Commits 5 Branches 0 Tags
57655dfd6091e211b1cc5c3a08d94e10f60c32cf
Commit Graph

724 Commits

Author SHA1 Message Date
LetterJay
57655dfd60 Merge pull request #3760 from Citadel-Station-13/upstream-merge-32290 
[MIRROR] fixes being able to recharge an object with an inducer while inside the object
 2017-11-03 00:12:22 -05:00
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
Leo
cf6ee8d4c2 Merge pull request #32288 from kevinz000/patch-369 
Fixes hand tele adjacent attacks teleporting you
 2017-11-01 21:38:21 -05:00
LetterJay
84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251 
[MIRROR] Nerfs peaceborg chain bucklestun
 2017-11-01 01:44:55 -04:00
LetterJay
5d46fbb8d3 Merge pull request #3730 from Citadel-Station-13/upstream-merge-32250 
[MIRROR] Makes greyscaled cables' color viewable in map editing
 2017-11-01 01:44:05 -04:00
AnturK
d792624dd8 Nerfs peaceborg chain bucklestun (#32251) 
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
 2017-10-31 17:40:03 -05:00
oranges
59f3a714e2 Merge pull request #32250 from ninjanomnom/map-cable-color 
Makes greyscaled cables' color viewable in map editing
 2017-10-31 15:30:45 -05:00
kevinz000
d836803b53 Makes varediting pneumatic cannon easier and makes the code less snowflake-y (#31752) 
* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm
 2017-10-31 09:14:16 -05:00
CitadelStationBot
e7179ba02d [MIRROR] Removes force from slappers (#3711) 
* Merge pull request #32153 from tgstation/Cyberboss-patch-4

Removes force from slappers

* Removes force from slappers
 2017-10-31 00:43:48 -07:00
LetterJay
cfae6fc672 Merge pull request #3704 from Citadel-Station-13/upstream-merge-32146 
[MIRROR] Fixes rollies not being effective
 2017-10-31 03:01:56 -04:00
LetterJay
8923b75a74 Merge pull request #3697 from Citadel-Station-13/upstream-merge-32211 
[MIRROR] Fixes cyborg upgrades not applying to held items
 2017-10-31 02:59:58 -04:00
LetterJay
6ba4300f6e Merge pull request #3696 from Citadel-Station-13/upstream-merge-32212 
[MIRROR] fixes radios being perma-stuck on when emped
 2017-10-31 02:59:32 -04:00
LetterJay
8c1dcd9429 Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986 
[MIRROR] You can now hide grenades in plushies
 2017-10-30 23:33:16 -04:00
LetterJay
f80bb03a23 Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238 
[MIRROR] welder refuelling hotfix
 2017-10-30 23:30:22 -04:00
LetterJay
21d4ed4a5f Merge pull request #3685 from Citadel-Station-13/upstream-merge-32200 
[MIRROR] Adds force to items that lack force and shouldn't.
 2017-10-30 22:14:15 -04:00
LetterJay
636e2a6d90 Update grenade.dm 2017-10-30 17:32:08 -05:00
Jordan Brown
2855553b4e Merge pull request #32146 from PKPenguin321/patch-20 
Fixes rollies not being effective
 2017-10-30 15:01:24 -05:00
Jordan Brown
b859a3f1aa Merge pull request #32211 from YPOQ/borgupgradefix 
Fixes cyborg upgrades not applying to held items
 2017-10-30 14:40:57 -05:00
kevinz000
0efaf92b6f fixes radios being perma-stuck on when emped (#32212) 
* fix radio emps

* woops forgot something!

* Update headset.dm
 2017-10-30 14:38:46 -05:00
Ashe Higgs
0c4c4dc1f2 You can now hide grenades in plushies 2017-10-30 14:34:01 -05:00
LetterJay
0256d9af4a Update tools.dm 2017-10-29 22:41:56 -05:00
bgobandit
119129a80c Adds force to items that really should hurt when hit by (#32200) 2017-10-29 18:49:48 -05:00
PKPenguin321
36893d3188 welder refuelling hotfix 2017-10-29 17:23:15 -05:00
PKPenguin321
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
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