Commit Graph

53 Commits

Author SHA1 Message Date
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
CitadelStationBot
ece7f0e905 Adds two more drinks, Bastion Bourbon and Squirt Cider (#5681) 2018-02-24 06:11:45 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
MoreRobustThanYou
9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 03:02:29 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Ashe Higgs
be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
oranges
3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-04 19:06:02 -04:00
Joan Lung
02987715b0 Fixes Vanguard never stunning for more than 2 seconds 2017-10-01 19:29:34 -05:00
Robustin
1a53d9e524 2H Sword to the Cult Forge - Robustin's Github Adventure 2017-10-01 00:02:04 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
oranges
51b8f45345 Merge pull request #30802 from CPTANT/Stamina_regen_2
Stamina regen light
2017-09-20 03:52:59 -05:00
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502)
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
2017-09-11 20:54:55 -05:00
CitadelStationBot
b753909958 Cult ghosts can no longer be potentially deconverted or debrained 2017-08-29 10:25:31 -05:00
CitadelStationBot
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
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
d99d886aa4 Fixes carbons not handling the Blood-Drunk status effect properly 2017-07-18 06:46:06 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00
CitadelStationBot
2e9e7f5488 Cultists must be human to run for Cult Master status 2017-06-16 12:53:49 -05:00
LetterJay
2a5be91970 compile fixes 2017-06-12 16:12:00 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -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
b86db49d50 Crushers now actually mark 2017-05-24 18:28:52 -05:00
LetterJay
73dea85b15 commit/rej cleanup 2017-05-22 11:24:17 -05:00
CitadelStationBot
448dc20c2b Proto-kinetic crushers are significantly better 2017-05-20 12:42:11 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
2017-05-18 09:37:30 -05:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
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
LetterJay
ebb4e134cb commit 2017-05-13 23:45:02 -05:00
LetterJay
38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 2017-05-13 23:42:19 -05:00
kevinz000
41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458
[MIRROR] Belligerent now prevents you from running even between chants
2017-05-07 23:19:35 -07:00
kevinz000
bebb9ec571 Delete status_effect.dm.rej 2017-05-07 22:44:14 -07:00
kevinz000
14a9bda61e Update status_effect.dm 2017-05-07 22:44:06 -07:00
CitadelStationBot
f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot
b72f4102a1 Internal affairs upgrades [READY] 2017-05-06 10:16:24 -05:00
CitadelStationBot
7b6f278c87 Mania Motors now do minor damage and continue to affect targets after they leave its range 2017-05-04 00:16:08 -05:00
CitadelStationBot
301ad1b0fc Belligerent now prevents you from running even between chants 2017-05-01 12:49:28 -05:00
CitadelStationBot
1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
CitadelStationBot
fccbe18286 Status effects are actually deleted/handled when the mob is deleted 2017-04-29 16:50:50 -05:00
Poojawa
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
Poojawa
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
Poojawa
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
Poojawa
73b6b33f79 TG sync Sunday (#201)
* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping
2017-02-06 00:36:56 -06:00