shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,051 Commits 5 Branches 0 Tags
8c51b5648cbf64bb6383458b18377fc7bce365ee
Commit Graph
1188 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 0dcd93ad73 Merge pull request #2268 from Citadel-Station-13/upstream-merge-29706 
[MIRROR] Fixes showers breaking lighting objects.
 2017-08-07 07:18:17 -05:00
LetterJayandGitHub c5c25639ee Merge pull request #2267 from Citadel-Station-13/upstream-merge-29654 
[MIRROR] Fixes vendors not returning an Initialize hint
 2017-08-07 07:17:39 -05:00
LetterJayandGitHub 6c122ea563 Merge pull request #2269 from Citadel-Station-13/upstream-merge-29691 
[MIRROR] Replaces blob's send intercept sleep() with addtimer
 2017-08-07 07:17:24 -05:00
CitadelStationBot a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBotandkevinz000 90a7ead961 [MIRROR] The AI's internal camera functions better (#2219) 
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
 2017-08-05 10:24:58 -07:00
CitadelStationBot 5d0f206936 Replaces blob's send intercept sleep() with addtimer 2017-08-05 12:20:41 -05:00
CitadelStationBot 7f7aed0112 Fixes showers breaking lighting objects. 2017-08-05 12:20:37 -05:00
CitadelStationBot 99ca34a7b4 Fixes vendors not returning an Initialize hint 2017-08-05 12:20:34 -05:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 f5bc18bb55 buildmode fix + blueprints fix (#2261) 
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.

* sync turf.dm
 2017-08-04 11:46:11 -07:00
CitadelStationBotandkevinz000 70826963dd Tweaked SM overlay (#2243) 2017-08-04 08:43:02 -07:00
CitadelStationBotandkevinz000 04231f44b1 Improves Porta-Turret Performance (#2248) 2017-08-04 08:42:21 -07:00
CitadelStationBotandkevinz000 ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBotandkevinz000 9449004c36 Gives an initialize hint to stacks, boxes, closets and bots (#2256) 2017-08-04 08:41:04 -07:00
CitadelStationBotandkevinz000 23ed5ba2a2 Fixes noncultists being able to out literally everyone from bloodcult with a single item (#2212) 2017-08-03 06:18:23 -07:00
CitadelStationBotandkevinz000 d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039) 
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
 2017-08-03 06:12:27 -07:00
CitadelStationBotandkevinz000 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
CitadelStationBotandPoojawa dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
LetterJayandGitHub 5734a2c7ed Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610 
[MIRROR] Fixes devil pitchforks being uninitialized
 2017-08-02 06:06:33 -05:00
CitadelStationBot b0cf9356b7 Combine the two changeturf procs into one 2017-08-02 05:20:12 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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 1e82ad9d3e Fixes devil pitchforks being uninitialized 2017-08-01 17:57:44 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
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
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
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 e8ae703c16 Update turf.dm 2017-07-31 18:15:16 -05:00
LetterJayandGitHub 576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -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 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
CitadelStationBot 4ac6b49871 Corrected holding cell access requirements 2017-07-31 08:58:05 -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 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 0ac85c6756 Update sound.dm 2017-07-30 14:43:35 -05:00
CitadelStationBot 5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
LetterJayandGitHub 70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
LetterJayandGitHub 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
CitadelStationBotandkevinz000 f9a6ee8d76 Give c4 correct plastic_overlay (#2183) 2017-07-29 19:51:38 -07:00
CitadelStationBotandkevinz000 272414bd30 Fixes latejoin antagonist exploit (#2181) 2017-07-29 19:51:16 -07:00
CitadelStationBot 6990dcbceb Grammar fix for revenants 2017-07-29 21:03:12 -05:00
LetterJayandGitHub d07b21a9d8 Merge pull request #2174 from Citadel-Station-13/upstream-merge-29325 
[MIRROR] Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
 2017-07-29 15:47:48 -05:00