shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,455 Commits 5 Branches 0 Tags
18904f2f0f3422c7df86d1fed42cf2894401bfcb
Commit Graph
419 Commits
Author SHA1 Message Date
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJayandGitHub 2241f5ecfb Update cult_items.dm 2017-08-21 23:32:21 -05:00
LetterJayandGitHub cef534face Update mutations.dm 2017-08-21 23:31:55 -05:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
LetterJayandGitHub 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
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 8a7c0e657f Update powers.dm 2017-08-18 11:20:36 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 4bd5e318c2 Blobs can now sense loving cuddles! 2017-08-16 18:00:54 -05:00
LetterJayandGitHub 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJayandGitHub ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
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
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
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 ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -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 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
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 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