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

4093 Commits

Author SHA1 Message Date
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
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
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
deathride58
e739540177 Merge pull request #7032 from Citadel-Station-13/upstream-merge-38288 
[MIRROR] Removes a defect concerning a simple tool in the admin toolset
 2018-06-09 04:42:53 +00:00
deathride58
5858b790d7 Update cloning.dm 2018-06-09 00:34:01 -04:00
deathride58
b2d70b2f67 Merge pull request #7039 from Citadel-Station-13/upstream-merge-38279 
[MIRROR] Fix pAI suicide while in holoform deleting the card
 2018-06-09 04:29:30 +00:00
deathride58
0f388bc994 Merge pull request #7040 from Citadel-Station-13/upstream-merge-38266 
[MIRROR] Adds warning to shuttle purchase menu
 2018-06-09 04:28:59 +00:00
CitrusGender
9124dac65f Adds indestructible sandstone wall (#38350) 
* adds sandstone

* OKAY FINE KOR

JEEZ

* I am very angry right now

* you don't seem to understand

* Update closed.dm
 2018-06-07 23:16:17 -05:00
81Denton
16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -05:00
Tad Hardesty
38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 20:06:54 -05:00
Jordan Brown
674621a4ac Merge pull request #38288 from Jalleo/Removes_Admin_detect 
Removes a defect concerning a simple tool in the admin toolset
 2018-06-07 08:52:30 -05:00
AnturK
717e635d28 Fixes some holocall stuff (#38209) 
* Fixes some holocall stuff

* Yep
 2018-06-06 14:25:23 -05:00
LetterJay
fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868) 
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
 2018-06-05 23:12:55 -07:00
deathride58
bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 
[MIRROR] Refactor machinery to default to being anchored
 2018-06-05 23:37:20 +00:00
deathride58
cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193 
[MIRROR] Turns /datum.isprocessing into a datum flag
 2018-06-05 23:36:37 +00:00
MrDoomBringer
71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
deathride58
cff10c62d0 Update cloning.dm 2018-06-05 17:24:15 -04:00
81Denton
2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05:00