Commit Graph

341 Commits

Author SHA1 Message Date
kevinz000 d305bfaea7 Update augments_internal.dm (#30362) 2017-09-03 16:56:27 -05:00
Cyberboss 7e07e6e9af Merge pull request #30332 2017-09-02 23:13:20 -04:00
XDTM e91f0b213a Logs Voice of God in the feedback database 2017-09-01 12:49:33 +02:00
AnturK 5b36ea048b Fixes no drop implant 2017-08-31 13:27:21 +02:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk 1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk 371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
Jordan Brown 5ff62bfce4 Fixes runtimes cause by an improper override (#29653) 2017-08-02 23:13:36 +02:00
Jordan Brown 6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Jordan Brown 3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev 1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Cyberboss c074c5c3cb Merge pull request #29365 2017-07-30 20:55:05 -04:00
Cyberboss f5f3758df3 Merge pull request #29288 2017-07-30 20:54:22 -04:00
ShizCalev d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
XDTM 97fc07898c Merge branch 'master' into Hallucinations3.0 2017-07-29 12:43:18 +02:00
Unknown 2efdc78681 this fixes the PR 2017-07-29 03:52:55 +02:00
Qustinnus 7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
Anonmare 0fe067676a Update augments_arms.dm 2017-07-27 14:34:36 +01:00
Tacolizard 7a64ded7a2 Adds cybernetic organs (#29276)
add: Added cybernetic organs to RnD, they can be used to replace organic organs. Remember to administer corazone during implantation though!
add: Added the upgraded cybernetic liver. It is exceptionally robust against toxins and alcohol poisoning.
2017-07-26 11:29:28 +12:00
Qustinnus 18216bf15c this revives the proc 2017-07-24 12:28:27 +02:00
Qustinnus e6d95a2beb this kills the proc 2017-07-24 11:45:03 +02:00
Anonmare 88272be0e1 Update augments_arms.dm 2017-07-22 20:49:50 +01:00
Qustinnus 49638035e4 removes nulls, fixes some likes/dislikes and adds metabolism rates 2017-07-19 22:40:17 +02:00
Qustinnus 85bbc2460e woops 2017-07-19 22:17:35 +02:00
Qustinnus 76d574f1d1 moves disgust to stomach 2017-07-19 22:16:52 +02:00
Qustinnus 2312ff09be Fixing conflicts 2017-07-19 11:19:52 +02:00
XDTM 1c716c2f0f Merge branch 'master' into Hallucinations3.0 2017-07-18 22:04:13 +02:00
Fox McCloud c10c9442a5 Refactor Lung Handling (#29280)
* Refactor Lung Handling

* fix ups

* fixes
2017-07-18 10:58:23 -04:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Joan Lung ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
XDTM 5fafc73094 Hallucinations 3.0 2017-07-15 21:03:34 +02:00
Tacolizard 2b053f2a0e Organ Update [Cloning isn't broken edition] (#29223)
* initial

* add paranthesis

* add zones

* update DNA

* indent

* descriptions

* start refactor

* update dme

* paranthesis

* remove old proc

* refactor digestion onto stomach

* add handle_liver()

* fix

* add stabiliver

* add a warning for liver failure

* lower frequency of warning message

* switch to prob

* fix permissions

* forgot something

* change recipe

* implement liver damage

* change operator

* fix

* fix

* oh the irony

* rebalance

* refactor alcohol tolerance and add med scanning

* fix

* misc fixes, changes and refactors

* fix?

* remove src

* misc changes

* more bugfix attempts

* Update liver.dm

* Update stomach.dm

* FIXED!!!!

* preparation for rnd organs

* rename var

* string changes

* implement tox filtration

* fix

* fix

* fix

* toxin filtration v2

* misc fix

* fix

* fix

* should not be coding this late at night

* reee

* misc

* fix runtimes

* digest me

* typepeath

* add mutant support

* comment and spacing

* commentz

* typepath

* fixes

* fix?

* fix

* change

* plasmeme organs!

* Update liver.dm

* Update stomach.dm

* stabiliver => corazone

* cyberboss review

* cyberboss more like cyberBOOB

* okay cyberBOOB

* cyberBOOOOOb

* static list

* fix?

* fix

* ID please

* hows that for resolving name collision?

* Fix shit

* fixes cloning
2017-07-14 09:59:48 -04:00
shizcalev 62b32d3f7a reverted organ refactor #28913
reverts #28913
2017-07-11 22:08:57 -04:00
Jordan Brown d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
Tacolizard 127003957b Organ Update: Refactors chemical and nutrient metabolization onto two new organs, the liver and the stomach. (#28913)
* initial

* add paranthesis

* add zones

* update DNA

* indent

* descriptions

* start refactor

* update dme

* paranthesis

* remove old proc

* refactor digestion onto stomach

* add handle_liver()

* fix

* add stabiliver

* add a warning for liver failure

* lower frequency of warning message

* switch to prob

* fix permissions

* forgot something

* change recipe

* implement liver damage

* change operator

* fix

* fix

* oh the irony

* rebalance

* refactor alcohol tolerance and add med scanning

* fix

* misc fixes, changes and refactors

* fix?

* remove src

* misc changes

* more bugfix attempts

* Update liver.dm

* Update stomach.dm

* FIXED!!!!

* preparation for rnd organs

* rename var

* string changes

* implement tox filtration

* fix

* fix

* fix

* toxin filtration v2

* misc fix

* fix

* fix

* should not be coding this late at night

* reee

* misc

* fix runtimes

* digest me

* typepeath

* add mutant support

* comment and spacing

* commentz

* typepath

* fixes

* fix?

* fix

* change

* plasmeme organs!

* Update liver.dm

* Update stomach.dm

* stabiliver => corazone

* cyberboss review

* cyberboss more like cyberBOOB

* okay cyberBOOB

* cyberBOOOOOb

* static list

* fix?

* fix

* ID please

* hows that for resolving name collision?

* Fix shit
2017-07-10 17:21:27 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Xhuis a9f94cf44c Gives role checks to the Voice of God 2017-07-03 18:58:23 -04:00
Tacolizard bd28d98c62 Heartbeat fix (#28916)
* fix

* Update life.dm

* add repeat

* fix

* Update heart.dm

* TRUE
2017-06-30 10:17:31 -04:00
Tacolizard 848690e5b8 Adds heartbeats (#28858)
* beatz

* use defines

* comments

* start refactor

* refactor 2

* finish refactor

* fix

* Update misc.dm

* Update life.dm

* Update heart.dm

* Update heart.dm

* remove human checks

* move things around

* woops

* wew

* update lowest sound channel

* remove stopsound

* get_turf
2017-06-28 15:01:04 -04:00
Matthew Walker f3afd18551 Move eye_damage from /mob/ to eye organs (#28725)
* First test change, only damage

* take out unused var

* null check

* First test change, only damage

* take out unused var

* null check

* Fixes some wizard stuns (#28693)

* First test change, only damage

* take out unused var

* null check

* review changes

* Hate git
2017-06-27 16:51:29 -04:00
Joan Lung deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
Mike Long 39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Jordan Brown 50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Joan Lung 38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
Joan Lung 563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04: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
Mike Long 3ddef57ecf Vomit fix (#28492) 2017-06-16 17:18:19 -03:00