Commit Graph

727 Commits

Author SHA1 Message Date
Ian Turk
c7f00fb44c Prefixed all disability defines with DISABILITY to fix name collision with BYOND built in BLIND define 2017-12-22 23:49:41 -06:00
Jordan Brown
8fad15df0c Merge pull request #33704 from Fox-McCloud/arm-implant-fix
Fixes Arm Implant EMP Effect
2017-12-21 01:43:43 -05:00
Fox McCloud
dce8366bb4 Fixes Arm Implant EMP Effect 2017-12-20 00:00:52 -05:00
XDTM
146d167189 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
* Refactors disabilities into lists, allowing for independent disability sources

* defines

* Xhuiiiiissss

* living

* did that

* adjusted for traumas

* Updates pacifism and removed remove_all_disabilities from fully_heal to prevent issues.

* makes antur happy
2017-12-18 22:20:07 +01:00
XDTM
b5d9845edf [Ready]Brain Trauma additions (#33405)
* Brain Trauma additions

* Adds Aphasia

* Adds the aphasia language

* Short window

* nuke exploits GONE

* fixes draggable portals

* psychobrawl won't just kill you if you use it too much, but stuns longer

* Adds anosognosia, and lowers thresholds

* .

* RANDOM GODWOKEN

* Default brain damage is now 0

* antur

* fix 1

* forcemove and afk friend adjustments

* okay it's ready now

* dead people can hear imaginary friends
2017-12-17 18:10:25 +01:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
MoreRobustThanYou
d3aacc2a54 [READY] Monkey mode overhaul (#32916)
* Monkey mode overhaul

* Fix some runtimes

* Clean up code a bit

* Woops!

* WOOPS #2

* Fix stuff.

* Antag datum!

* Fixes

* Fix a runtime

* Fix leaders not being monkeyfied

* ...

* Logging

* Monkey major/minor victory

* Ventcrawling, etc etc

* REEEE

* Forgot a "user".

* handle ninjanomnom's review

* .
2017-12-16 13:34:51 +13:00
oranges
7d424b475d Merge pull request #33298 from QualityVan/zombrain
Fixes zombie head removal
2017-12-15 10:53:30 +13:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
vuonojenmustaturska
a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
duncathan
770a97249c cleans up atmos defines 2017-12-08 02:03:47 -06:00
XDTM
550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
QualityVan
39099e26e1 Fixes zombie head removal 2017-12-05 10:42:04 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev
2a45c389ae Fixes humans missing legs moving slower in space 2017-11-20 05:23:38 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Jordie
8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
vuonojenmustaturska
39375d5cc2 Replaces a bunch of mob loops with hopefully better ones (#32786)
* Free codebase churn

* fixes dviewmob

* a commit

* Partial revert "Free codebase churn"

This reverts commit 9dd41b3860c331637bbc85e694dd32dc59768ad5.

* better fix to dviewmob

* renames living_mob_list to alive_mob_list, adds mob_living_list and carbon_list

* make some use out of the shiny carbon list

* make some use out of the shiny new living list

* more things, also make the mobs subsystem (Life) use living list

* bonus

* domo arigato mr. roboto

* compile fixes, also made the drone code less dumb

* better?

* make admin message prettier

* honk

* fixes blobs

* rev fixes

* one small thing
2017-11-16 23:08:40 +01:00
Tad Hardesty
8423e0e685 Fix HUD conflicts and inappropriate HUD removals
The Odysseus's medical HUD and the RD hardsuit's diagnostic HUD no
longer conflict with wearing those HUDs as glasses.

HUDs from glasses are no longer removed inappropriately by taking off a
flightsuit's helmet.
2017-11-15 02:00:27 -08:00
swindly
d3df913402 fixes spelling and stuff (#32531) 2017-11-09 11:03:50 -06:00
ACCount12
294071371a Fixes lizard tail spikes 2017-11-05 17:12:39 +03:00
oranges
ea17a59919 Merge pull request #32374 from swindly/master
Fixes canceling cavity implants
2017-11-05 21:09:25 +13:00
swindly
6fe81af275 Allows cyborgs to perform limb augmentation (#32233)
* allows organ storage bags to be used to augment limbs

* replaces hardcoded stuff with intiial()
2017-11-02 23:21:14 -04:00
nicbn
34bd538bcf Rename brown gas to nitryl (#32271) 2017-11-01 15:00:59 -06:00
ACCount
b5e074661f Refactor of catpeople mutant organs (#32101)
* Refactor of cat mutant organs

* Damage multiplier for ears
2017-11-01 21:14:34 +01:00
swindly
a4f0f8a4f7 adds attempt_cancel_surgery helper and allows canceling of handle_cavity 2017-10-31 16:54:06 -04:00
oranges
8b0f63cf3d Merge pull request #32109 from ACCount12/runtime_a_day
Fixes a common runtime on prefs screen
2017-11-01 09:20:58 +13:00
as334
43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
ACCount
323c4a7496 Fixes a runtime on organ replacement 2017-10-25 23:37:22 -05:00
ACCount12
a4310b4c7b Fixes a common runtime on prefs screen 2017-10-25 23:50:11 +03:00
Leo
ff6b21e70d Merge pull request #32071 from ShizCalev/heart-spam-fix
Fixes heartbeat message spam
2017-10-25 11:40:10 -02:00
KorPhaeron
d657c19156 Dullahans (#31855)
* Dullahans

* Vision toggle

* The worst part of the code right here

* No wings

* to_chat

* Hearing relay that works, vision toggle that works

* Fixes hair not appearing on severed heads

* Halloween event

* Moves dullahans to their own file

* Forgot to commit a file

* Fixes deafness and backpack issues

* Don't need to breath because you dont have a head

* Breaking the dullahan rules

* Encourage dullahans to lose their heads

* Cyberboss doing his job to head off any bad code trying to enter the repo

* Committing while compiling again

* Can't eat

* Halloween!

* qdeleted

* Get rid of the head var entirely, just track the easily deletable relay

* Moves the stuff out of process to destroy
2017-10-24 21:35:19 +02:00
ShizCalev
121765440f Fixes heartbeat message spam 2017-10-24 08:40:56 -04:00
Jordan Brown
8e434b7d96 Removes duplicate typecaches (#31883)
* Audits all typecache calls for performance gains

* Fix invalid var
2017-10-23 15:24:41 +02:00
Mercenaryblue
123aaef6ea Decapitation creampie fix [Fix] (#19701) (#31749)
* creampie fixes

prevent stacking creampie overlays.
makes cleaning it easier.
also fixing the creamy decapitation bug. ( #19701)

* optimize

* Revert "creampie fixes"

This reverts commit cb1d5bf254339442c977c0400317b20d3d130970.

* Split Issues

making sure we have one PR per issue.

* head removal fix
2017-10-16 23:12:46 +02: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
kevinz000
b83d777119 Removes a bunch of sleeps/spawns and makes a few booleans defines (#31553)
* spawn/sleep removal part 1

* sleep/spawn/src. removal

* fixes type paths in timers

* Fixes some variable passing

* Why do I have to do this 20 times to get it right..?

* Why do I have to do this 21 times to get it right..?

* Update suicide.dm

* Update software.dm

* Update paper.dm

* Update cable.dm

* Update ninjaDrainAct.dm

* Update hypospray.dm

* Update vocal_cords.dm

* Update touch_attacks.dm

* Update revenant_abilities.dm

* woops

* Update revenant_abilities.dm
2017-10-14 19:53:17 -04:00
kevinz000
c43e205959 loc -- > forcemove (#31176)
* manually done

* Update syndicatebomb.dm

* Update robot.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update devil.dm

* Update bedsheet_bin.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update devil.dm

* Update door_assembly.dm
2017-10-13 00:12:03 +13:00
duncathan salt
454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
MrROBUST
fb3a6bfbfc [ReadyForReview]Correct organ manipulation step for robotic prosthesis surgery (#30818)
* Try to make some steps repeatable

* Done making repeatable steps
Organ manipulation steps now repeatable
Dummy robotic prosthesis organ manipulation step

* few more steps

* implant removal for augmentations
2017-10-10 21:32:08 +13:00
kevinz000
f372ac0b3b Fixes invalid arg runtime with drop_if_replaced (#31439)
* Update augments_eyes.dm

* Update eyes.dm
2017-10-09 20:04:37 -04:00
Jordan Brown
b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges
134bbd1223 Merge pull request #31238 from AnturK/specialeyes
Space vision fix V2.0 - GAME_PLANE change
2017-10-05 09:13:41 +13:00
AnturK
85cd9e60d9 Organ initialization cleanup 2017-10-03 14:17:44 -05:00
AnturK
2db4228b22 Fixes space vision with eye organs + verbs missing with nightvision 2017-10-02 18:54:36 +02:00