shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph
54 Commits
Author SHA1 Message Date
MoreRobustThanYouandCitadelStationBot 41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303) 
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
 2017-11-02 04:13:18 -05:00
kevinz000andCitadelStationBot ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBotandPoojawa 083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
CitadelStationBot b753909958 Cult ghosts can no longer be potentially deconverted or debrained 2017-08-29 10:25:31 -05:00
CitadelStationBot 12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
CitadelStationBotandkevinz000 4c4bd22578 [MIRROR] Some more tweaks to Geis (#2487) 
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
 2017-08-27 01:36:17 -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
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -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 d16f68b4da Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#2173) 2017-07-28 23:52:02 -07:00
CitadelStationBotandkevinz000 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBotandkevinz000 7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
CitadelStationBotandkevinz000 f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBotandkevinz000 059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJayandGitHub 1054100178 Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108 
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
 2017-07-03 17:46:37 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay 87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
LetterJay f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay 4386813269 upstream-merge-27996 2017-06-11 02:17:53 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot 92e3754bfb Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power 2017-06-07 03:06:26 -05:00
CitadelStationBot 4d25a6e299 Only human and silicon servants can help recite multi-invoker scriptures 2017-06-04 19:23:18 -05:00
PoojawaandGitHub 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot b943780a8c If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-19 06:25:19 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot bbcc6f9be9 Proselytizing alloy shards will now proselytize all the shards in the tile 2017-05-18 16:37:26 -05:00
CitadelStationBotandPoojawa b0760b9b33 Fixes not being able to cancel Geis and being able to cancel Volt Void (#998) 2017-05-18 12:07:02 -05:00
LetterJayandGitHub 8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596 
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
 2017-05-13 00:57:48 -04:00
LetterJay 18bb37f34a rej remove 2017-05-12 23:03:48 -05:00
LetterJay a7a32e6127 commit 2017-05-12 23:03:27 -05:00
kevinz000andGitHub 13b0ae2b45 Merge pull request #676 from Citadel-Station-13/upstream-merge-26725 
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
 2017-05-07 19:37:35 -07:00
CitadelStationBot 5cb2c2152b Clockcult component generation will automatically focus on components needed to activate the Ark 2017-05-01 12:50:33 -05:00
CitadelStationBot fad23e97c3 Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass 2017-05-01 07:24:29 -05:00
CitadelStationBot 6aa436c874 Whisper() now has the same args as Say() 2017-04-28 20:53:20 -05:00
PoojawaandGitHub 9e72b1b8fd /tg/ 4/14 (#367) 
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
 2017-04-14 23:28:04 -05:00
PoojawaandGitHub 7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
PoojawaandGitHub f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00
PoojawaandGitHub 0bca862419 Overhauls and 2/28 sync (#244) 
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
 2017-02-28 09:30:49 -06:00
PoojawaandGitHub fc2dbcd9fe Tg port 2 15 (#230) 
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
 2017-02-15 03:35:32 -06:00
PoojawaandGitHub 6674f9fc15 Tg 2 11 sync (#215) 
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
 2017-02-12 03:56:14 -06:00
Poojawa 01ed369034 game folder 2017-02-08 00:02:05 -06:00