shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,968 Commits 5 Branches 0 Tags
bbcad2fa5862a0ea30cc290351b65d0d1703da3a
Commit Graph
3968 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub 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
CitadelStationBot 277b7e6f80 Automatic changelog generation for PR #2209 [ci skip] 2017-07-31 23:45:33 -05:00
ktccdandkevinz000 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
CitadelStationBot b9970cc9b1 Automatic changelog generation for PR #2211 [ci skip] 2017-07-31 23:45:02 -05:00
ktccdandkevinz000 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
LetterJayandGitHub e86355ed6d Merge pull request #2072 from Citadel-Station-13/upstream-merge-29367 
[MIRROR] split typecache filters into two procs
 2017-07-31 18:32:18 -05:00
LetterJayandGitHub e8ae703c16 Update turf.dm 2017-07-31 18:15:16 -05:00
LetterJayandGitHub 3be62f3ccd Update _lists.dm 2017-07-31 17:33:13 -05:00
LetterJayandGitHub 576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00
LetterJayandGitHub bb4a98937f Merge pull request #2071 from Citadel-Station-13/upstream-merge-29363 
[MIRROR] Fix missing keyword argument syntax in typecache_filter_list
 2017-07-31 17:14:38 -05:00
LetterJayandGitHub aedd22090b Update _lists.dm 2017-07-31 15:40:52 -05:00
CitadelStationBot 075c64a504 Automatic changelog generation for PR #2065 [ci skip] 2017-07-31 15:37:43 -05:00
LetterJayandGitHub af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
ktccdandGitHub 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
ktccdandGitHub 3083ad7aa0 Merge pull request #2205 from Citadel-Station-13/upstream-merge-29581 
[MIRROR] Corrected holding cell access requirements
 2017-07-31 22:05:09 +02:00
ktccdandGitHub 9918ed7d0c Merge pull request #2204 from Citadel-Station-13/upstream-merge-29582 
[MIRROR] Update labor camp stacker accepted sheets.
 2017-07-31 22:04:28 +02:00
ktccdandGitHub 55e2c49b5a Merge pull request #2203 from Citadel-Station-13/upstream-merge-29583 
[MIRROR] Fixes a cliffhanger comment
 2017-07-31 22:03:16 +02:00
ktccdandGitHub b8c8f9d3b2 Merge pull request #2202 from Citadel-Station-13/upstream-merge-29577 
[MIRROR] Cyborgs grabbing ore works consistently
 2017-07-31 22:02:44 +02:00
CitadelStationBot a50dc9dc96 Automatic changelog generation for PR #2196 [ci skip] 2017-07-31 14:59:12 -05:00
ktccdandGitHub 445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412 
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
 2017-07-31 21:59:10 +02:00
CitadelStationBot 409c8ffe3e Automatic changelog generation for PR #2193 [ci skip] 2017-07-31 14:51:43 -05:00
ktccdandGitHub 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 6148b2165c Automatic changelog generation for PR #2186 [ci skip] 2017-07-31 14:48:52 -05:00
ktccdandGitHub f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547 
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
 2017-07-31 21:48:50 +02:00
ktccdandGitHub aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540 
[MIRROR] Fixes mutation toxins not stunning properly
 2017-07-31 21:46:03 +02:00
CitadelStationBot 3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
CitadelStationBot 4ac6b49871 Corrected holding cell access requirements 2017-07-31 08:58:05 -05:00
CitadelStationBot 29b26fbc3e Update labor camp stacker accepted sheets. 2017-07-31 08:57:59 -05:00
CitadelStationBot 2d74f9f45a Fixes a cliffhanger comment 2017-07-31 08:57:56 -05:00
CitadelStationBot d3f488a5ee Cyborgs grabbing ore works consistently 2017-07-31 07:10:17 -05:00
LetterJayandGitHub 8a174f8a76 Update damage_procs.dm 2017-07-31 06:24:52 -05:00
LetterJayandGitHub dc9c53ae0a Update combat.dm 2017-07-31 06:13:00 -05:00
PoojawaandGitHub f53d66b319 Rabbit parts (#2201) 2017-07-31 05:54:16 -05:00
LetterJayandGitHub ac9c24dfe5 Update combat.dm 2017-07-31 05:53:58 -05:00
CitadelStationBot 0aca8441ec Automatic changelog generation for PR #2170 [ci skip] 2017-07-31 03:43:22 -05:00
LetterJayandGitHub 62d7f47497 Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455 
[MIRROR] Adds 3D Sound System
 2017-07-31 03:43:20 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 79bf3edab9 Update syndi.dm 2017-07-31 02:14:50 -05:00
LetterJayandGitHub 4f324214c5 Update plasmamen.dm 2017-07-31 02:14:15 -05:00
LetterJayandGitHub 0bba1ec9b6 Update miscellaneous.dm 2017-07-31 02:13:42 -05:00
LetterJayandGitHub fe37d52cc5 Update hardsuit.dm 2017-07-31 02:12:22 -05:00
LetterJayandGitHub f90ddf0596 Update lizard.dm 2017-07-30 23:35:11 -05:00
LetterJayandGitHub bdcc4bc429 Update miscellaneous.dm 2017-07-30 23:33:58 -05:00
LetterJayandGitHub 4c0c11524b Update syndi.dm 2017-07-30 23:32:50 -05:00
LetterJayandGitHub a99fa2ea49 Update plasmamen.dm 2017-07-30 23:31:33 -05:00
LetterJayandGitHub e3dfc8b61d Update miscellaneous.dm 2017-07-30 23:30:51 -05:00
LetterJayandGitHub 85885330ba Update hardsuit.dm 2017-07-30 23:29:36 -05:00
LetterJayandGitHub 40216683e0 Update gibspawner.dm 2017-07-30 23:26:16 -05:00
LetterJayandGitHub feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
CitadelStationBot c4cf30c4eb Automatic changelog generation for PR #2154 [ci skip] 2017-07-30 23:15:34 -05:00