Commit Graph

1792 Commits

Author SHA1 Message Date
Fox McCloud
d219e2d86e Fixes Reagent Overdose Runtimes 2018-10-16 23:05:34 -04:00
Mark Mak
21cae85a91 Merge pull request #9830 from Birdtalon/chem
Small chem master icon fix/cleanup
2018-10-13 09:02:25 +08:00
Birdtalon
98a084921f moves chem master to using update_icon() fixes not using no power sprites 2018-10-13 00:22:03 +01:00
Birdtalon
e9d153daf4 moves check and add to reagents holder datum 2018-10-12 15:59:30 +01:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
variableundefined
2ea037cc73 Merge pull request #9747 from SamHPurp/runtime-cheating
Fixes Reagent Holder.dm Runtime, from cooking
2018-10-09 08:27:04 +08:00
Purpose
9563628234 ack 2018-10-08 19:19:04 +01:00
variableundefined
b070ca12d9 Merge pull request #9643 from farie82/PANDEMIC-Upgrade
Added the ability to print a virus release form using the PANDEMIC
2018-10-08 12:33:29 +08:00
Crazylemon64
3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Purpose
3b1e6ad01a no no no no 2018-10-07 22:24:10 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
farie82
78a8da9e8b Update pandemic.dm 2018-10-01 20:00:36 +02:00
joep van der velden
4cf95b9958 PANDEMIC print stuf. Yiz 2018-09-29 22:59:05 +02:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Desolate
27ab332e4b added soybeanoil to soybeans, juice now for soymilk 2018-09-12 17:21:03 -05:00
Crazy Lemon
c37170b868 Merge pull request #9259 from Kyep/make_meth_less_op
Reduces speed bonus from Meth
2018-09-04 09:46:55 -07:00
Unknown
62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02:00
Superhats
747cf2044b Hyposprays ! 2018-08-26 14:53:51 +02:00
Crazy Lemon
275a4d4c54 Merge pull request #9325 from Agameofscones/medicalhypo_sprite
Medical Hypospray sprite change
2018-08-16 11:14:23 -07:00
Birdtalon
d9555921b4 adds user feedback 2018-08-10 12:17:15 +01:00
Birdtalon
a987dac795 changes the check to total_volume 2018-08-08 14:07:51 +01:00
Birdtalon
3472eba242 prevents 0 value pills being created 2018-08-08 13:32:24 +01:00
Gwydion Brain
f1bdbaf375 medicalhypo initial 2a 2018-08-07 03:49:49 -07:00
Gwydion Brain
442b7320b8 medicalhypo initial 1A
+medivend_hypo icon state
=changes medical hypospray to use said sprite
=changes medical hypospray description to hopefully confuse security and traitors less.
2018-08-06 22:19:08 -07:00
Fox McCloud
3193d599cb Medical Hypospray 2018-08-02 23:39:15 -04:00
Kyep
8b5f59fe9d Merge remote-tracking branch 'ParadiseSS13/master' into make_meth_less_op 2018-07-29 17:07:42 -07:00
datlo
f167c32424 Fixes pyrosium description 2018-07-29 18:42:30 +01:00
Kyep
3de3bb807e GOTTAGOFAST_METH 2018-07-26 12:48:13 -07:00
Kyep
4e3893dc00 renames GOTTAGOREALLYFAST to GOTTAGOFAST2 2018-07-26 12:44:55 -07:00
Crazy Lemon
e48ab63bcc Merge pull request #9218 from Fox-McCloud/beesplosion
Adds Beesplosion Chemical Reaction
2018-07-21 21:11:33 -07:00
Fox McCloud
72309e4694 protection 2018-07-21 23:17:48 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Fox McCloud
bf8dd30a2a Adds Beesplosion Chemical Reaction 2018-07-16 22:16:57 -04:00
Fox McCloud
9463807ac2 done 2018-07-09 05:45:01 -04:00
Anasari
6c8bba3f63 Merge branch 'master' into CryoLog 2018-06-26 16:24:29 +08:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000
70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery
Adds Plastic Surgery; Fixes Disfigurement
2018-06-13 13:20:00 -07:00
Ansari
0b0b1b7478 Make it so that spray displays coordinate of user (Instead of the spray which is always 0,0,0) 2018-06-07 22:33:27 +08:00
Fox McCloud
482904befc Merge pull request #9086 from tigercat2000/spacemandmm_fixes
Macro Refactor for SpacemanDMM
2018-06-03 19:45:33 -04:00
Fox McCloud
7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Fox McCloud
b17d7ad335 Merge remote-tracking branch 'upstream/master' into plastic-surgery 2018-05-30 11:44:06 -04:00
Fox McCloud
bbfe4f675e fix redundancy 2018-05-27 15:04:45 -04:00
Fox McCloud
e9c4568c4f tweaks 2018-05-27 14:15:14 -04:00