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

4110 Commits

Author SHA1 Message Date
Irafas
75335cb30b PDA can be ctrl-clicked to remove the item in its pen slot (#38577) 
* Makes pens ez to remove from pda

Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.

* added instructions when examined.

Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.

* PDA can now be dragged without dropping the pen.

When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.

* quick change to examine text.

* comma

* Improved the examine
 2018-06-19 09:49:36 -05:00
LetterJay
7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539 
[MIRROR] Adds New Shuttle Chairs
 2018-06-18 21:58:42 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJay
81b88d0d85 Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543 
[MIRROR] Fix non-secure windoors not supporting One Required access mode
 2018-06-18 12:30:26 -05:00
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
LetterJay
78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524 
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
 2018-06-18 10:10:49 -05:00
LetterJay
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00
LetterJay
aa0e383a2c Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490 
[MIRROR] Fixes missing creampies
 2018-06-18 09:50:56 -05:00
LetterJay
a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486 
[MIRROR] Removes an unused open turf var
 2018-06-18 09:50:35 -05:00
Tad Hardesty
896942dcf1 Fix non-secure windoors not supporting One Required access mode (#38543) 2018-06-18 09:39:00 -05:00
fludd12
96b620d540 Adds New Shuttle Chairs (#38539) 
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
 2018-06-18 09:38:25 -05:00
Tlaltecuhtli
1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
Tad Hardesty
27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
LetterJay
21af80d0d8 Merge pull request #7122 from Citadel-Station-13/upstream-merge-38493 
[MIRROR] Corrects typos
 2018-06-16 16:42:36 -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
LetterJay
351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500 
[MIRROR] Fixes attacking wooden walls
 2018-06-16 16:17:28 -05:00
Jordan Brown
e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
Dax Dupont
bde58b5442 Fixes missing creampies (#38490) 2018-06-16 06:19:45 -05:00
Emmett Gaines
3e8168890f Removes an unused open turf var (#38486) 2018-06-16 06:19:37 -05:00
Jordan Brown
c25971d569 Merge pull request #38493 from ShizCalev/typo-fix 
Corrects typos
 2018-06-16 06:19:20 -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
Emmett Gaines
1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
AnturK
460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
CitadelStationBot
4780f3a20b [MIRROR] Add a missing space in mechacode (#7080) 
* Merge pull request #38413 from Tlaltecuhtli/patch-45

Add a missing space in mechacode

* Add a missing space in mechacode
 2018-06-15 02:50:06 -07:00
CitadelStationBot
95a9942bdc [MIRROR] Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector (#7105) 
* Cloning deletion fix (#38438)

* Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector
 2018-06-15 02:48:10 -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
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
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
496a1d1165 [MIRROR] [s] Fixes sleeper logging. (#7085) 
* Merge pull request #38429 from AnturK/runtimeA

[s] Fixes sleeper logging.

* [s] Fixes sleeper logging.
 2018-06-12 17:23:37 -07:00
LetterJay
14f7ca0449 Merge pull request #7072 from Citadel-Station-13/upstream-merge-38376 
[MIRROR] [s] Fix lockboxes not actually being locked
 2018-06-12 08:08:15 -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
oranges
4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -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
oranges
3aaad1bc31 Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally 
Fix pulling diagonally looking goofy
 2018-06-11 22:29:01 -05:00
deathride58
67a5eee94b Merge pull request #7057 from Citadel-Station-13/upstream-merge-38396 
[MIRROR] Adds logging for sleeper chem injections
 2018-06-12 03:14:14 +00:00
Cameron!
8a989d2afe Quartermaster can no longer be a changeling or traitor (#7062) 
* Quartermasters can no longer be changelings

Consistency with heads of staff not being antagonists.

* oops forgot this

Thanks Glitchy
 2018-06-11 13:40:19 -07:00
ShizCalev
849c33f9bf Adds logging for sleeper chem injections (#38396) 2018-06-11 00:04:21 -05: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
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
CitadelStationBot
e68fbe9fa4 [MIRROR] Readds actual fun to admins throwing around drop pods (#7052) 
* Readds actual fun to admins throwing around drop pods (#38374)

* Readds fun

* Fun

* Readds actual fun to admins throwing around drop pods
 2018-06-10 12:28:38 -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
38878094bc Merge pull request #6982 from Citadel-Station-13/upstream-merge-38264 
[MIRROR] Fix autoprocessing cloners
 2018-06-09 05:13:23 +00:00