shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,590 Commits 5 Branches 0 Tags
5ee2ee38b366a797f683f356d7bb6aedc164126b
Commit Graph

6587 Commits

Author SHA1 Message Date
LetterJay
5ee2ee38b3 Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers." 2018-06-16 16:18:50 -05:00
LetterJay
cc54931a66 Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434 
[MIRROR] Fixes chem heater trying to heat up empty beakers.
 2018-06-16 16:18:42 -05:00
LetterJay
5cf9320999 Merge pull request #7117 from Citadel-Station-13/upstream-merge-38477 
[MIRROR] [s] Prevent unbreakable ladders from being moved by shuttles
 2018-06-16 16:17:45 -05:00
Tad Hardesty
a7b900425b [s] Prevent unbreakable ladders from being moved by shuttles (#38477) 
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
 2018-06-16 06:18:08 -05:00
Armhulen
bf4be90f76 quickie fixies (#38511) 2018-06-16 06:16:56 -05:00
CitadelStationBot
773ba43974 [MIRROR] Fixes null bullets from being fired after they're deleted (#7102) 
* Fixes null bullets from being fired after they're deleted (#38437)

* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.

* works for me

* Update _box_magazine.dm

* Fixes null bullets from being fired after they're deleted
 2018-06-15 02:48:48 -07:00
CitadelStationBot
a8b5d744e8 [MIRROR] RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself (#7084) 
* RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself

* Update life.dm
 2018-06-15 02:47:52 -07:00
CitadelStationBot
eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094) 
* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!
 2018-06-15 02:46:40 -07:00
CitadelStationBot
a3f8e18e26 [MIRROR] Androids are immune to radiation (#7091) 
* Androids are immune to radiation (#38420)

* Androids are immune to radiation
 2018-06-15 02:42:59 -07:00
CitadelStationBot
46b2bc0c63 [MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092) 
* Add pacifism check for screwdriver/bottle attacks (#38416)

* [s]Add pacifism checks for screwdriver/bottle attacks
 2018-06-15 02:42:34 -07:00
CitadelStationBot
7ac96e2288 [MIRROR] Equalizes thresholds on being fat (#7095) 
* Equalizes thresholds on being fat (#38383)

* Equalizes thresholds on being fat
 2018-06-13 20:33:19 -07:00
CitadelStationBot
ae9c3f4b83 [MIRROR] You can see what other people eat or drink (#7101) 
* You can see what other people eat or drink (#38395)

* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent

* You can see what other people eat or drink
 2018-06-13 20:31:38 -07:00
CitadelStationBot
d06df512d0 [MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081) 
* [s] Fixes exploit where botany trays can be refilled at no cost.

* Merge pull request #38422 from DaxDupont/hydroponics

[s] Fixes exploit where botany trays can be refilled at no cost.
 2018-06-13 20:25:08 -07:00
CitadelStationBot
d875c362fa [MIRROR] Turf grammar omnibus (#7104) 
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
 2018-06-13 19:31:29 -07:00
CitadelStationBot
8ec3ac03cd [MIRROR] Fixes drunken scientist R&D point gain. (#7098) 
* Fixes drunken scientist R&D point gain. (#38432)

* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.

* Fixes drunken scientist R&D point gain.
 2018-06-13 19:28:35 -07:00
AnturK
549d6f0ab8 Fixes chem heater trying to heat up empty beakers. 2018-06-13 04:25:28 -05:00
LetterJay
64d5c8cbdc Merge pull request #7073 from Citadel-Station-13/upstream-merge-38381 
[MIRROR] Fix legion cores not healing confusion
 2018-06-12 08:09:20 -05:00
LetterJay
d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424 
[MIRROR] Removes doubled iaa definition.
 2018-06-12 08:08:39 -05:00
LetterJay
2c0a82ec50 Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378 
[MIRROR] Fix deaf people hearing borg modules going offline
 2018-06-12 08:03:40 -05:00
LetterJay
49cdba9f90 Merge pull request #7069 from Citadel-Station-13/upstream-merge-38380 
[MIRROR] Give plasmamen their plasma suits in VR
 2018-06-12 07:59:20 -05:00
LetterJay
ac078c4789 Merge pull request #7068 from Citadel-Station-13/upstream-merge-38382 
[MIRROR] Make chat squashing HTML-agnostic II
 2018-06-12 07:58:55 -05:00
LetterJay
87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
LetterJay
e20db49269 Merge pull request #7066 from Citadel-Station-13/upstream-merge-38366 
[MIRROR] Replace area-wide fire overlay with reddening the lights
 2018-06-12 07:38:13 -05:00
LetterJay
b9365f45e1 Merge pull request #7056 from Citadel-Station-13/upstream-merge-38394 
[MIRROR] Fixes and Upgrades Stabilized Gold Extracts
 2018-06-12 07:35:47 -05:00
Jordan Brown
adf4cad9ea Merge pull request #38424 from AnturK/iaafixup 
Removes doubled iaa definition.
 2018-06-11 22:30:26 -05:00
Jordan Brown
9835bed8d4 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 22:30:18 -05:00
oranges
69730f0a60 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-11 22:29:51 -05:00
oranges
997d85329c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes 
Give plasmamen their plasma suits in VR
 2018-06-11 22:29:43 -05:00
oranges
bc35ff9b10 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup 
Make chat squashing HTML-agnostic II
 2018-06-11 22:29:36 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -05:00
deathride58
e30807616a Merge pull request #7058 from Citadel-Station-13/upstream-merge-38372 
[MIRROR] Makes swimsuits an underwear option
 2018-06-12 03:15:58 +00:00
deathride58
a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58
a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
AnturK
6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
fludd12
c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
CitadelStationBot
6d9543511f [MIRROR] Fixes loading zlevels with static lighting. (#7051) 
* Fixes loading zlevels with static lighting. (#38365)

* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct

* Fixes loading zlevels with static lighting.
 2018-06-10 12:32:58 -07:00
CitadelStationBot
cc4ffe31dd [MIRROR] Fixes note/message interface flooding the string tree. (#7048) 
* Merge pull request #38379 from MrStonedOne/fasternotes

Fixes note/message interface flooding the string tree.

* Fixes note/message interface flooding the string tree.
 2018-06-10 12:32:10 -07:00
CitadelStationBot
2a727c6df2 [MIRROR] Removes unused overview code. (#7054) 
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
 2018-06-10 12:31:19 -07:00
CitadelStationBot
1bf74841c7 [MIRROR] Removes reactive incendiary armor from non-admin methods of obtaining (#7050) 
* Make incendiary armor aspawn only (#38370)

* Removes reactive incendiary armor from non-admin methods of obtaining
 2018-06-10 12:30:57 -07:00
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07:00
CitadelStationBot
6510066918 [MIRROR] Logs minor and major crimes (#7053) 
* Merge pull request #38358 from nfreader/record_crimes

Logs minor and major crimes

* Logs minor and major crimes
 2018-06-10 12:29:15 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
4241ef321e Merge pull request #7027 from Citadel-Station-13/upstream-merge-38301 
[MIRROR] Fixes infrared emmiters partially.
 2018-06-09 05:25:54 +00:00
deathride58
8dc3d5f70a Update suicide.dm 2018-06-09 00:47:48 -04:00
deathride58
9963d5a365 Merge pull request #7022 from Citadel-Station-13/upstream-merge-38294 
[MIRROR] Readds hunger slowdown
 2018-06-09 04:45:08 +00:00
deathride58
aae9df5335 Merge pull request #7035 from Citadel-Station-13/upstream-merge-38333 
[MIRROR] Remove mobs from idle NPC pool on Destroy
 2018-06-09 04:41:22 +00:00
deathride58
0e3d5a7512 Update infrared.dm 2018-06-09 00:35:13 -04:00
deathride58
1fdbd81023 Merge pull request #7037 from Citadel-Station-13/upstream-merge-38320 
[MIRROR] Fixes Lisa's description
 2018-06-09 04:31:20 +00:00