Commit Graph

28718 Commits

Author SHA1 Message Date
Rob Bailey
1173c2c468 Fixes welding goggles design (#45556)
* Fixes this stupidity

* compilegood
2019-07-29 18:51:58 -07:00
tralezab
e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -07:00
AnturK
714c61c70f Adds way to add/remove traits for admins (#45503) 2019-07-29 02:21:22 -07:00
RandolfTheMeh
48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
Garen Crownguard
58b5819be0 Fixes infinite loop when you catch a cult bola (#45492) 2019-07-28 17:58:35 -07:00
xmikey555
80df08aefd Fixes 357 autolathe shells, also fixes the custom incapacitating shot (#45527)
* fixes materials for 357 casing

* also fixing incapacitating shot
2019-07-28 17:57:37 -07:00
bgobandit
a0a7d0ff33 Disguised syndicate saboteur cyborgs now use the regular cyborg bubble_icon. (#45515) 2019-07-28 17:56:28 -07:00
Tlaltecuhtli
80f593dda6 puts message spam from not having keys on a vehicle on cooldown (#45507)
* Update maps.txt

* Update ridden.dm
2019-07-28 17:23:47 -07:00
nemvar
3526418a00 Fixes the ORM. (#45522) 2019-07-28 17:23:27 -07:00
kingofkosmos
f887a0b114 Console alt-clicking tweaks (#45193)
* * reworked consoles so you can:
 * use attackby to insert id
 * use alt-click to eject id
 * examine to see if alt-click is available
 * moved eject_id and insert_id procs to _computer.dm
 * added some sound effects

* * prisoner management console new features: insert id with attackby and eject with altclick

* * prisoner management console can't have multiple prisoner id's inserted

* removed unnecessary src. and changed usr --> user

* made gulag teleporter consistent with attackby, altclick and examine.
simplified attackby on card.dm

* equipment reclaimer station consistent with id attackby, altclick-eject and examine.
point claim console consistent with id attackby, altclick-eject and examine.

* ore redemption machine and mining equipment vendor made consistent with id attackby, altclick-eject and examine.

* * reworked all eject/insert ID copypastacodes into procs in _machinery.dm

* * 0's to FALSE

* hopefully i didnt mess up any more things in the resolve

* everything now uses id_insert-proc and doesn't work.

* compiles but doesn't work

* works
2019-07-28 16:25:36 -07:00
Kyle Spier-Swenson
0fa87b7bbd [s]Throttle mind notes (memories) (#45555)
* Throttle mind notes (memories)

Some dipshit is spamming this on ss13 servers

Limits to 100 times the message limit (removing old text after that), and one call every 5 game seconds.

* Throttle at the right place

* Not here

* We really need a generic throttler solution
2019-07-29 09:09:33 +12:00
nemvar
21883b69ea compilegood 2019-07-28 19:56:49 +02:00
nemvar
ea6b398e2b Fixes this stupidity 2019-07-28 19:36:15 +02:00
Garen Crownguard
e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
nemvar
a52b4ec73d Removes emag and emp species hooks. (#45478) 2019-07-28 04:41:42 -07:00
Garen Crownguard
bab2b442cb Fixes long hair going through hoods (#45500) 2019-07-28 04:34:35 -07:00
Akrilla
9df1854c20 Tweak contract roundend text (#45506)
Moves buys and (used X Rep) on same line
2019-07-27 20:21:59 -07:00
loser
9b9e846ebc E (#45475) 2019-07-27 20:18:10 -07:00
Tlaltecuhtli
67fe38921a fireball starts at 8 tile range, increases 2 for every level (#45404)
* Update maps.txt

* 1

* levels
2019-07-27 20:09:46 -07:00
senjx
40fca141ef Fixes #44963, adds force and flag checks for items attacking brains (#45428)
* Adds force and flag checks for items attacking brains

Adds a force check and a NOBLUDGEON flag check for items that attack brains to prevent accidental or ridiculous brain damage via straw.

* Update brain_item.dm

* Adds force and flag checks for items attacking brains

Adds force and flag checks for items attacking brains to prevent accidental or ridiculous brain damage via straw/pen/whatever
Fixes https://github.com/tgstation/tgstation/issues/44963
2019-07-27 20:00:52 -07:00
py01
353ef81789 Magic projectile fixes (#45484)
* magic projectile changes

* fixes var path

* undoes magic changes

* magic proj changes

* am checkchaange

* removes bad refactor

* proper am check on mag missile

* locker staff fix
2019-07-27 19:58:58 -07:00
AarontheIdiot
debf6ad6d2 goggies (#45460) 2019-07-27 22:29:53 +02:00
TheChosenEvilOne
9227c18fc2 Hardsuit helmets protect against space again. (#45524)
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-07-27 17:31:07 +02:00
Tlaltecuhtli
c1176fdc24 you can press the conveyor switch in hand to link any not deployed belts to it (#45440)
* Update maps.txt

* 1

* belts

* sadsdfburerdfs

* Update conveyor2.dm
2019-07-27 04:47:15 -07:00
Dennok
ede9edd17e Fix mob fall in open space on zero gravity (#45437)
* Fix mob fall in zero gravity

first try

* up
2019-07-27 04:38:32 -07:00
Suicidalpickles
1dbe76fcdc changes rev deconversion text color (#45480)
* color change

.

* puts span back

* line suggestion change

Co-Authored-By: ShizCalev <ShizCalev@users.noreply.github.com>
2019-07-27 02:25:20 -07:00
Dennok
97328e9ab3 RCD update (#45357)
Add simple circuits to rcd
2019-07-27 02:11:23 -07:00
zxaber
aaaee29a63 [READY] Re-works the Durand ability (#45144)
* Woo shields

* reshuffle, adding a sound

* Re-organizing

* better defines for the signals I had

* new stuff

* fixes

* Replaced all instances of "defence" with defense"

and other small changes.

* oof

* spelling, and a forgotten check

* you, upgraded, improved, yes
2019-07-27 02:06:33 -07:00
nemvar
449e5d38e6 This turns butchering into something that resembles a component. (#45299)
* This turns butchering into something that resembles a component.

* Changes how the recycler works.
It no longer uses butchering in disgusting ways.

* I guess this works? It's not pretty though.

* How the fuck...
2019-07-26 23:57:37 -07:00
Akrilla
7fbe4c0bac Contract extraction doesn't strip borgs (#45470)
* dont strip borgs

* yikes

* indent
2019-07-26 17:57:41 -07:00
Time-Green
d4bfdd2a40 Plumbing: Chemical Acclimators (#45243)
* Finishes pump and fixes visual bug with disconnecting plumbing objects

* More bugfixes, finishes liquid pump

* Chemical synthesizer, wrench signal to handle unwrenching

* adds input and output pipes and changes ob into obj

* dmdocs all of plumbing through proper means

* adds sprites by meyhaza

also added wrenching interaction and fixed a dumb dumb with me fucking up an object path

* brightens the sprites a little by me

* removes big select from synthesizer ui

* update tgui.js thing

* unfuck pump color

apparently the replace all of spriting has downsides

* chemical acclimator

only heats and cools but i gotta commit and do other stuff

* finishes chemical acclimators

* uodates .dme

* updates .dme again

forgot plumbing component
2019-07-26 17:43:45 -07:00
nervere
d9abd3930a adds jojo hat (#45451) 2019-07-26 17:42:56 -07:00
AarontheIdiot
e819a661e7 Removes plasma man welding/flash protection (#45369)
* slows plasmen by .5

* removes plasmeme flash and welding protection

* the accursed speedmod 0.5 is gone, welding goggles are available at autolathey

* removed a redundant line

* adding welding goggles to autolathe will be moved to a different PR
2019-07-27 00:15:09 +02:00
skoglol
718973fb9f Removes the assimilation/hivemind gamemode (#45316)
* Initial pass

* comment.

* stray ,

* stray define begone
2019-07-27 00:08:53 +02:00
nemvar
fa0c53f89b This var didn't exists. (#45510) 2019-07-26 16:10:02 -04:00
MMMiracles
cded323274 Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-07-26 15:23:56 -04:00
oranges
51744f7dbe autodoc organ helpers (#45464) 2019-07-26 03:01:22 -07:00
oranges
d65de92ed1 Autodoc the vending machine (#45468)
* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>
2019-07-26 03:00:43 -07:00
Fikou
a65d7d0f03 sabo zipties (#45450) 2019-07-26 02:20:23 -07:00
nemvar
63e6c9199e Borg hats now use a global typecache instead of unique lists. (#45368) 2019-07-26 10:57:26 +02:00
nemvar
1428679249 Reworked Legion feat. vectors and lazy sprites. (#45227)
* One

* adds the attack for megafauna.

* saves a few lines of precious diff

* return

* slightly uncurses it.

* That's a lotta damage

* Legion buffs

* There we go. Audio feedback and stuff.

* Untouches code this has no buisness touching,

* Removes mean comments

* comment spelling

* Alright, this replaces the process.

* Removes the unneeded file
2019-07-26 10:54:09 +02:00
tralezab
378c8f17d5 unless? (#45461) 2019-07-25 23:25:27 -07:00
tralezab
64550884fa [READY] Ian's Birthday Holiday (#45356)
* ian's birthday

* missing )

* hop shirt + bday cake is on front desk

* confetti 1/2

* confetti 2/2

* corgi balloon, hop gets a knife to cut the cake

* forgot knife + inhands + mapping

* oranges review, old var removed

* oranges request ;)
2019-07-25 23:23:53 -07:00
py01
4441ff39bd Beepsky is now electric immune (#45392)
* beepsky is electric immune

* beepsky now overrides electrocute_act entirely

he gains a short speed boost when shocked instead

* Update traits.dm

* Update secbot.dm
2019-07-25 23:19:37 -07:00
Arkatos1
5ba54c29b9 New Wizard icons (#45439) 2019-07-25 23:16:30 -07:00
FantasticFwoosh
c85080e490 Fixes fake basalt tiles costings (#45445)
Stack recipie now relies upon 'glass ores' to craft, which when the tile is dug returns 2 sand, the same amount to craft one fake volcanic tile, ending the exploit.
2019-07-25 23:12:40 -07:00
XDTM
f3a61c718c Fixes nanite regen programs (#45447) 2019-07-25 23:12:16 -07:00
imsxz
0d01b55046 removes printing revolver speedloaders (#45344) 2019-07-25 23:11:17 -07:00
ShizCalev
742bab881d Merge pull request #45458 from optimumtact/cbeamsonfire
keyloop no longer runtimes if the client is mobless
2019-07-25 21:20:51 -04:00