Commit Graph

56 Commits

Author SHA1 Message Date
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
TheGamerdk
8b4a8afdc7 Zombies own 2021 (#10816)
* more traits

* Update code/modules/antagonists/zombie/abilities/tank.dm
2021-02-13 16:16:00 +00:00
TheGamerdk
4e95227477 Zombie Gamemode (#7984)
* thing

* fixed

* noi

* thing

* i hate you

* nerf

* Stuff

* Zombies!

* Thing

* Fixes evo

* Balance

* damage

* Less

* Stamina damage BAD!

* Acid less shit

* buff

* Nerfs

* RUN!

* refactor

* Cooldown

* Admin add

* span

* Forced zombify, fuck you marmio

* Rebalance

* ...

* fix

* Handcuffs bad!

* Damage

* spit

* less OP

* Classes Finished

* Fixed

* murderbone bad, mkay!

* stupid

* thing

* Fixes

* Report

* uoh

* few fixes

* fuck you alexkar

* stuff

* duck you alexkar

* small fixes

* woop

* Update hud.dmi

* pog

* awkward

* pog

* hey

* Update zombie.dm

* Update hud.dm
2020-12-31 11:24:03 +00:00
alexkar598
3e93e8b123 Revert "council wont give maints access to tgs so they have to merge and revert to test merge (#7979)" (#7980)
This reverts commit 4bc71186e7.
2020-03-14 19:22:50 -04:00
TheGamerdk
4bc71186e7 council wont give maints access to tgs so they have to merge and revert to test merge (#7979)
* thing

* fixed

* noi

* thing
2020-03-14 17:04:31 -04:00
alexkar598
2c121f09ec Update code/modules/zombie/items.dm 2019-08-15 22:05:39 -04:00
alexkar598
da4d05a881 Update code/modules/zombie/items.dm 2019-08-15 21:59:53 -04:00
Theos
1b1de2f873 armor buff yay 2019-08-15 18:35:11 -04:00
SomeguyManperson
df52788b81 FUCK 2019-08-02 02:07:17 -04:00
Gary Lafortune
9f9dc8cd6a REGEX REPLACE! /(?<=[^\w\/])add_trait\(/ -> /ADD_TRAIT\(src, / 2019-06-01 23:01:12 -05:00
coiax
66df5546ee Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 21:22:38 +01:00
ShizCalev
6dd67981ce Fixes ODing on crank/other chems, viruses, and other things damaging/healing robotic limbs. (#41593)
cl ShizCalev
fix: Fixed chem OD's causing damage to robotic limbs.
fix: Fixed wood golems repairing robotic limbs every tick of life()
fix: Fixed vampires repairing robotic limbs every tick of life()...
fix: Fixed shadowpeople healing robotic limbs every tick of life()
fix: Fixed poppeople healing robotic limbs every tick of life()
fix: Fixed adjustBruteLoss and adjustFireLoss not properly discriminating for limb status types.
tweak: Fixed bibles healing robotic limbs, because your false deity can't fix SCIENCE.
fix: Fixed the Starlight Condensation, Nocturnal Regeneration, Tissue Hydration, Regenerative Coma, and Radioactive Resonance virus symptoms repairing robotic limbs.
/cl

Gonna be away the next two weeks, so if there's anything major after today just go ahead and close it and I'll fix it when I get back.
2018-12-02 08:11:18 +01:00
Qustinnus
c00a94b80e Adds a new race: Ethereal (also adds wrappers for nutrition adjustment) (#40995)
cl Qustinnus / Floyd / Ethereal sprites by Space, is that it? / Alerts and food sprites by MrDroppodBringer
add: Adds Ethereal; a race which lives off of electricity and shines bright. If they are healthy they shine a bright green light, and the more damaged they are, the less they shine and the greyer they become. Their punches do burn damage and they are weak to blunt attacks!
They dont need to eat normal food and dont have nutrition, Instead they gain charge by going into borg rechargers, eating ethereal food or doign specific interactions.
refactor: all nutrition changes now go through a proc so we can override behavior
/cl

Adds Ethereal. A race which is essentialy inspired by Zoltan but then with different mechanics to make it fit with SS13 more. I'm trying to stay away from making them actually provide power but the change from nutrition to electricity seemed kind of fun.

They have the following specifications:

    They are walking lights; and shine bright and green if healthy, and get greyer and darker the more damaged they are. When dead they are just a grey unlit corpse.
    They do burn punch damage instead of blunt.
    They are weaker to blunt; especially when low on charge
    They have charge instead of nutrition. Charge is gained by some interactions or by going into a borg charger. or eating new ethereal food.
    They are slightly stronger to shock damage, and gain charge from it a bit; however, it is still deadly to them and thus they aren't free insulated gloves.
2018-11-28 22:09:32 +01:00
fluffe9911
2525c23290 Zombie Organ now does toxin damage! (#39553)
* Zombie Organ now does tox damage

* Adds some ominous dots

* Makes zombies not get the you feel sick message

* Makes the mass zombie infection button not be a kill everyone slowly button part 1

* Makes the mass zombie infection button not be a kill everyone slowly part 2

* Makes romerol use nodamage version
2018-08-18 19:05:00 +01:00
AnturK
2dee6bb275 Simple zombie for WJ (#39563) 2018-08-10 20:34:23 +01:00
Jordan Brown
670340c6bc Merge pull request #39032 from XDTM/ZombieMedication
Reworks zombie revival
2018-07-13 23:16:05 +01:00
XDTM
884d2fb042 Fixes romerol zombifying alive hosts (#39005) 2018-07-10 10:35:58 +01:00
vuonojenmustaturska
77410bd84b Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 15:48:10 +02:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
checkraisefold
18956b76fd fix zombie reanimation (#33049)
lol
2017-11-24 23:35:33 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
bgobandit
807bbbbd45 Fixes various spelling and grammar errors. (#31764)
* Fixes various spelling and grammar errors.

* check

* CEASE

* i cant stop
2017-10-16 15:06:10 -04:00
Jordan Brown
04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04:00
MoreRobustThanYou
1cae7e2aae Zombies now stay dead if they suicide (#30941)
* Zombies now stay dead if they suicide

* Update items.dm

* Update items.dm
2017-09-23 20:32:44 +10:00
Robustin
2a8047ea9c Zombie claws do +1 damage (#30826)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Zombie claws do one more damage

* Update items.dm
2017-09-19 00:07:13 -05:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Leo
42dffeed07 Merge pull request #28572 from Xhuis/zombie_revive_message_shrink
Reduces the size of the zombie revival flavor text (Fixes #28568)
2017-06-19 21:52:57 -03:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Xhuis
81951d87c5 Shrinks the zombie revive message 2017-06-18 20:59:43 -04:00
QualityVan
d0a05792c5 Brains extracted from infectious zombies keep their old species 2017-05-23 15:34:26 -04:00
oranges
7cfef759af Merge pull request #26527 from QualityVan/mutanthands
Zombie/limb refactors/fixes
2017-04-29 14:03:53 +12:00
QualityVan
edf412baa9 not good to store old species immediately after changing species, turns out 2017-04-24 15:42:39 -04:00
QualityVan
6590860250 Refactors zombie organs
Fixes mounted chainsaws leaving a limb if acided
Adds species support for mutanthands, basically hard-equipped items like zombie claws
Fixes zombies not having claws on new arms
Mobs manually set to zombie species revert to human when their infection is removed
Inserts organs back into the mob when a bodypart is reattached
No longer generates eyes or ears when a mob changes species without having a head

Todo:
fix the initial problem of zombies being able to not have claws due to having a nodrop item before zombification and losing it
2017-04-24 15:32:00 -04:00
Joan Lung
db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
XDTM
71b01007cc Gives an icon to the zombie festering ooze (#25493) 2017-03-26 14:07:16 -03:00
Cyberboss
456b055135 Makes zombie hands indestructible 2017-03-21 09:49:44 -04:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Robustin
555a67301f Improved Zombie Revive (#23601)
* Update organs.dm

* Update organs.dm

* Update organs.dm

* Rewording the desc
2017-02-03 19:43:37 -06:00
coiax
7e4a0ee0df Adds Romerol (the REAL zombie powder) to uplink (#23369)
* Adds Romerol (the REAL zombie powder) to uplink

🆑 coiax
add: Syndicate agents have gained access to a highly dangerous
experimental bioterror agent, that causes partial reanimation and
aggression after death.
del: Zombie infections are no longer visible on MediHUD.
/🆑

- Adds a reagent to the uplink that gives anyone who injests it a
dormant zombie organ that will reanimate them as a zombie after they
die.
- Initial price estimate is 20TC because this is some fungal TB level
!fun!.
- Good for traitor chefs.
- Zombies are fun, let's have more of them.

* Fixes runtimes, removes airlock tearing

* aGGression

* Update health?

* Zombies are not TOXINLOVERS that's dumb

* Removes from uplink

* Revert "Removes from uplink"

This reverts commit a0acd313929b0787c2eab0d7f289e305212fa0ed.

* 25 TC
2017-01-29 11:21:37 -06:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
oranges
4f9166d3b6 Correct call to addtimer, preventing runtime (#21661)
All the arguments passed into the arglist appear to be required to not
be named arguments, so this simply strips out the named arguments and
passes them in as the base format.

This is confusing
2016-11-22 17:23:18 -05:00
Joan Lung
4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
Joan Lung
ce40d29ead Makes the pronoun helper proc names less horrifyingly long (#20780)
* why were these so LONG, what the fuck

* gosh

* pronoun agenda
the true agenda is killing coiax's squished lines
2016-10-10 12:28:25 +13:00
Cheridan
1e92582bdd Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall
Adds some pronoun helpers
2016-09-29 12:41:27 -05:00
oranges
e3ce14d8fc Fix an incorrect call to addtimer (#20691) 2016-09-27 15:59:35 -05:00