shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,010 Commits 5 Branches 0 Tags
1b22c5fe0c0bd6ca2996f45958e1866a19b1c1bd
Commit Graph
4010 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CitadelStationBotandkevinz000 cfa77cdc18 apperance ---> appearance (#2218) 2017-08-03 06:03:25 -07:00
CitadelStationBotandkevinz000 6cd0855b5a Unifies datum var definitions (#2237) 2017-08-03 06:02:58 -07:00
CitadelStationBotandkevinz000 87b56c9d9c Testmerged [s] PRs no longer shown to non-admins (#2220) 2017-08-03 06:02:37 -07:00
CitadelStationBotandkevinz000 91a44d4c35 Makes cyborg remote interaction limited. (#2230) 2017-08-03 06:02:15 -07:00
CitadelStationBot 5839703519 Automatic changelog generation for PR #2233 [ci skip] 2017-08-03 08:01:30 -05:00
CitadelStationBotandkevinz000 6f855fbd52 Adds another planetstation mob, the "Seedling" (#2233) 2017-08-03 06:01:28 -07:00
CitadelStationBotandkevinz000 36029ea7cb Fixes explosion_block being inconsistent (#2236) 2017-08-03 06:00:35 -07:00
CitadelStationBotandkevinz000 4843cbe67d Fixes subsystem MC crash tracking (#2239) 2017-08-03 06:00:03 -07:00
CitadelStationBotandkevinz000 365fe761a0 Makes bIcon scale to 16x16 like byond chat output did (#2238) 2017-08-03 05:59:38 -07:00
kevinz000andGitHub e6b07f5e96 Revert "Fixes DoS vulnerability" (#2240) 2017-08-03 05:59:30 -07:00
CitadelStationBotandPoojawa dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot 22e79761c2 Automatic changelog generation for PR #2172 [ci skip] 2017-08-02 06:28:10 -05:00
CitadelStationBotandPoojawa f62fc85f0d [MIRROR] Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list. (#2172) 
* Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list.

* clean up + manual sync
 2017-08-02 06:28:08 -05:00
CitadelStationBot 4b3d878e1d Automatic changelog generation for PR #2180 [ci skip] 2017-08-02 06:21:42 -05:00
LetterJayandGitHub 96e3946fdd Merge pull request #2180 from Citadel-Station-13/upstream-merge-29564 
[MIRROR] Stunbatons now properly appear on security belts when active
 2017-08-02 06:21:40 -05:00
LetterJayandGitHub c443a63b05 Merge pull request #2227 from Citadel-Station-13/upstream-merge-29620 
[MIRROR] fixes astar and windoors
 2017-08-02 06:06:58 -05:00
LetterJayandGitHub b8eb8ebea4 Merge pull request #2223 from Citadel-Station-13/upstream-merge-29603 
[MIRROR] Fixes silicons not returning an Initialize hint
 2017-08-02 06:06:46 -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
LetterJayandGitHub 79213c7f76 Merge pull request #2226 from Citadel-Station-13/upstream-merge-29618 
[MIRROR] Combine the two changeturf procs into one
 2017-08-02 05:32:40 -05:00
CitadelStationBot 7cfcd1ec15 fixes astar and windoors 2017-08-02 05:22:18 -05:00
CitadelStationBot b0cf9356b7 Combine the two changeturf procs into one 2017-08-02 05:20:12 -05:00
CitadelStationBot 3a33ca7c56 Automatic changelog generation for PR #2162 [ci skip] 2017-08-02 04:57:57 -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 f19a9e855a Automatic changelog generation for PR #2143 [ci skip] 2017-08-01 23:55:55 -05:00
LetterJayandGitHub 3d6200ce41 Merge pull request #2143 from Citadel-Station-13/upstream-merge-29492 
[MIRROR] Tweaks the ash walker nest so that lava rivers won't wreck them
 2017-08-01 23:55:53 -05:00
LetterJayandGitHub 0392f761d0 Merge pull request #2117 from Citadel-Station-13/upstream-merge-29324 
[MIRROR] DCS Continued
 2017-08-01 23:55:14 -05:00
CitadelStationBot 6cb9444588 Fixes silicons not returning an Initialize hint 2017-08-01 18:10:59 -05:00
CitadelStationBot 1e82ad9d3e Fixes devil pitchforks being uninitialized 2017-08-01 17:57:44 -05:00
LetterJayandGitHub b3eaf226ac Merge pull request #2217 from Citadel-Station-13/upstream-merge-29598 
[MIRROR] Removes spaces to underline from add_details
 2017-08-01 17:08:14 -05:00
LetterJayandGitHub 03e508475f Merge pull request #2216 from Citadel-Station-13/upstream-merge-29601 
[MIRROR] Spellchecking
 2017-08-01 17:07:56 -05:00
CitadelStationBot e2c14f018b Automatic changelog generation for PR #2215 [ci skip] 2017-08-01 17:06:59 -05:00
LetterJayandGitHub e47677fce4 Merge pull request #2215 from Citadel-Station-13/upstream-merge-29319 
[MIRROR] Refactors pie throwing and fixes throwing not finalizing in some cases
 2017-08-01 17:06:57 -05:00
CitadelStationBot d6fdd618e8 Removes spaces to underline from add_details 2017-08-01 08:46:27 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot d176fcf24c Refactors pie throwing and fixes throwing not finalizing in some cases 2017-08-01 07:48:16 -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
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 cccfeb479e Update lavaland_surface_ash_walker1.dmm 2017-07-31 23:38:15 -05:00
LetterJayandGitHub 29f8f8eb45 Update component.dm 2017-07-31 23:36:49 -05: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