shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,650 Commits 5 Branches 0 Tags
71bb6c930c66991855158b6f71c29f653ba5546b
Commit Graph
64 Commits
Author SHA1 Message Date
LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBotandkevinz000 e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot d36bc75074 Fixes posters 2017-05-31 19:29:20 -05:00
CitadelStationBot c07034f45a The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it 2017-05-27 20:55:08 -05:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay 34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
CitadelStationBot e9cdeec4f6 Removes HasProx testing message 2017-05-22 22:48:13 -05:00
LetterJayandGitHub ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 
[MIRROR] Decentralized and Vastly Improved Gang Influence System
 2017-05-22 16:28:57 -05:00
CitadelStationBot 4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
Poojawa 587bc1795c missing files 2017-05-21 00:37:47 -05:00
PoojawaandGitHub 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBotandPoojawa 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) 
* Adds framework for cult constructs having the ability to make runes

* Delete mobs.dm.rej

* Update runes.dm

* clean .rej
 2017-05-20 23:12:51 -05:00
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBotandPoojawa eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
LetterJayandGitHub d40c2224c3 Merge pull request #624 from Citadel-Station-13/upstream-merge-26492 
[MIRROR] Adds new debug verb for highlighting roundstart ATs
 2017-05-18 05:51:54 -04:00
CitadelStationBotandPoojawa 8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBotandPoojawa 47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710) 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
 2017-05-18 01:39:16 -05:00
CitadelStationBotandPoojawa 257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay d7c24de679 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492 2017-05-17 09:58:53 -05:00
LetterJay f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJayandGitHub 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJayandGitHub 1c422705d0 Merge pull request #950 from Citadel-Station-13/upstream-merge-27190 
[MIRROR] WHOSE FOOTPRINTS ARE THESE
 2017-05-14 16:28:05 -04:00
CitadelStationBot 962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJayandGitHub 52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
CitadelStationBot 9dcac046ef WHOSE FOOTPRINTS ARE THESE 2017-05-13 18:01:40 -05:00
kevinz000 2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot 827bbb13c2 Adds an effect to Mending Mantra to show who is chanting it 2017-05-04 17:49:28 -05:00
CitadelStationBot 33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot 913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -05:00
LetterJay 4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay 0cf401934b manual merge 2017-04-29 07:57:16 -05:00
CitadelStationBot 717d63f129 Adds new debug verb for highlighting roundstart ATs 2017-04-28 10:59:14 -05:00
CitadelStationBot bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBotandPoojawa b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571) 
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
 2017-04-26 10:11:33 -05:00
CitadelStationBotandPoojawa a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
CitadelStationBot 4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
CitadelStationBot 1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBotandPoojawa 076562e7fd Fixes proximity_checkers being visible in the right click menu (#495) 2017-04-20 22:02:12 -05:00
CitadelStationBotandTalkingCactus 64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00
CitadelStationBotandTalkingCactus 4f4390fe01 Renames the Cleanable/ folder to cleanable/ (#396) 2017-04-15 14:48:29 -04: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 7ad5e22830 Wew lad (#305) 
* 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

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
 2017-03-22 02:55:33 -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