shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,412 Commits 5 Branches 0 Tags
dfd5c7465bbb8a166f3bf335d7dec98f8c4bb93b
Commit Graph

409 Commits

Author SHA1 Message Date
LetterJay
f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747 
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
 2017-08-21 20:32:10 -05:00
CitadelStationBot
772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -05:00
LetterJay
ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJay
95cbe66a3a Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870 
[MIRROR] Fixes a typo in the blobbernaut spawn text
 2017-08-18 13:41:37 -05:00
LetterJay
8a7c0e657f Update powers.dm 2017-08-18 11:20:36 -05:00
CitadelStationBot
4bd5e318c2 Blobs can now sense loving cuddles! 2017-08-16 18:00:54 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
LetterJay
31b501aa1a Merge branch 'master' into upstream-merge-29885 2017-08-14 19:41:45 -05:00
CitadelStationBot
5fd3a8355c Fixes the Resurrect Cultist rune not working 2017-08-14 16:05:33 -05:00
CitadelStationBot
e986657b16 Makes mulligan antag check for gamemode required players 2017-08-14 06:25:03 -05:00
CitadelStationBot
7fe8dd208d [s] Clean up some inputs 2017-08-14 02:44:24 -05:00
CitadelStationBot
7aa960b499 Fixes a typo in the blobbernaut spawn text 2017-08-14 01:23:57 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
LetterJay
e783997250 Merge pull request #2295 from Citadel-Station-13/upstream-merge-29742 
[MIRROR] GM completion check and mulligan now check to see if players are logged out
 2017-08-12 06:33:44 -05:00
CitadelStationBot
4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
LetterJay
43c774b72e Merge pull request #2319 from Citadel-Station-13/upstream-merge-29781 
[MIRROR] Fixes swarmer shells having no ghost notifications
 2017-08-09 11:25:02 -05:00
CitadelStationBot
83c546f143 Fixes swarmer shells having no ghost notifications 2017-08-09 03:26:14 -05:00
CitadelStationBot
943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -05:00
LetterJay
f68287e31e Merge pull request #2305 from Citadel-Station-13/upstream-merge-29766 
[MIRROR] Belligerent now has a visible indicator
 2017-08-09 02:20:51 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
fb86e03544 Belligerent now has a visible indicator 2017-08-08 09:05:54 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
40a8449f11 GM completion check and mulligan now check to see if players are logged out 2017-08-07 12:26:20 -05:00
LetterJay
8386d5e610 Merge pull request #2290 from Citadel-Station-13/upstream-merge-29735 
[MIRROR] Fixes being able to "stomp out" sigils with telekinesis
 2017-08-07 07:26:30 -05:00
LetterJay
b449843a1e Merge pull request #2270 from Citadel-Station-13/upstream-merge-29711 
[MIRROR] Fixes oversight with APCs using areastring
 2017-08-07 07:18:35 -05:00
CitadelStationBot
e80f1dba99 Fixes being able to "stomp out" sigils with telekinesis 2017-08-06 18:02:43 -05:00
CitadelStationBot
a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot
5d0f206936 Replaces blob's send intercept sleep() with addtimer 2017-08-05 12:20:41 -05:00
CitadelStationBot
8ca4b9d614 Clockcult Combat Rebalance + Conversion Rework (#2020) 
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures

* Update tips.txt

* no one cares

* manual clockcult syn
 2017-08-04 11:46:22 -07:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
23ed5ba2a2 Fixes noncultists being able to out literally everyone from bloodcult with a single item (#2212) 2017-08-03 06:18:23 -07:00
CitadelStationBot
1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
ktccd
608737376b Borer admin refactor (#2209) 
* Refactors and clarifications

Refactors borers to use objective datums instead of relying entirely on
hardcoded snowflake bullshit.
Also adds some FEEDBACK to the punishments, so the host isn't completely
confused why they suddenly keep getting stunlocked and blinded.
Also refactors syndi-borers to display their objectives along the other
borers instead of as an antag, since they TECHNICALLY count as a borer
for their escape objective, enabling them to cooperate.
Refactors borers weakness-chemical to be a variable instead of
hardcoded, allowing admin var-editing to work.
Borers now inherit the objectives of their parent-borer. Normally makes
no difference, but if admins were to give custom objectives to one
borer, then all its children will injerit it.

* Removed a line

Removed a piece of text that was redundant at best and incorrect at
worst. Syndicate borers makes it show up as the default 10 needed when
no other borers existed and normal borers already state their own
objective individually.
 2017-07-31 21:45:32 -07:00
ktccd
4c7f288341 Adds a HUD for borers (#2211) 
Borers with minds are added to the HUD and can see the HUD.
Humans with a borer are added to the HUD, but CANNOT see the HUD.
If the borer leaves, the human is removed from the HUD.
 2017-07-31 21:45:00 -07:00
ktccd
a2f92461a4 Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585 
[MIRROR] Improves several Sound Loops' Performance
 2017-07-31 22:06:17 +02:00
ktccd
a6e74b9a27 Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572 
[MIRROR] Removes a rogue period from the sliver theft objective
 2017-07-31 21:51:42 +02:00
CitadelStationBot
3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
LetterJay
feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
LetterJay
77c67b31c6 Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290 
[MIRROR] Unwrenching clockwork structures no longer damages them
 2017-07-30 23:14:39 -05:00
LetterJay
05f7040d12 Merge pull request #2155 from Citadel-Station-13/kevinz000-patch-4 
REEEEEE USE YOUR TRUE/FALSE DEFINES KTCCD
 2017-07-30 23:13:42 -05:00
CitadelStationBot
a98322d497 Removes a rogue period from the sliver theft objective 2017-07-30 19:58:11 -05:00
LetterJay
0e131b50e5 Merge pull request #2188 from Citadel-Station-13/upstream-merge-29546 
[MIRROR] Grammar fix for revenants
 2017-07-29 23:55:51 -05:00