Commit Graph

1826 Commits

Author SHA1 Message Date
oranges
9d6936a607 Merge pull request #18197 from pudl/tank
adds high-capacity watertanks
2016-06-07 13:01:16 +12:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn
Removes spawn() from some things
2016-06-07 10:21:54 +12:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
oranges
24cf031cb1 Merge pull request #17968 from Bobylein/chem-bottles-rework
Pill icons based on master reagent and transparent chem bottles
2016-06-07 09:56:11 +12:00
Kevin
e584256330 removed pill changes 2016-06-06 00:10:32 +02:00
Jack Edge
a01b48aa48 Removes spawn() from some things
Yay, refactoring.
2016-06-05 20:08:36 +01:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate.
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
2016-06-05 18:12:08 +02:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
phil235
b482764a19 - I made human/handle_blood() less shitty.
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
pudl
9b4bb04a61 adds tank 2016-06-02 22:07:23 -05:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
KorPhaeron
5db8a76217 Revert "Updates some lavaland ruins and adds new ones." 2016-06-01 16:47:16 -05:00
oranges
ce5bd19adb Merge pull request #18107 from lordpidey/lavaland_changes
Updates some lavaland ruins and adds new ones.
2016-06-02 09:07:32 +12:00
MMMiracles
5f773abf9b sorry timmy 2016-05-31 21:21:23 -04:00
oranges
2544171982 Merge pull request #18058 from lordpidey/bottlefix
Fixes condiment bottles losing name upon refilling.
2016-06-01 09:17:05 +12:00
Mike Long
cea21e4c57 Updates some lavaland ruins.
Adds lavaland wrath ruin.
Adds lavaland wrath ruin's reward.
Lavaland ruins can now cause sintouching.
2016-05-31 12:57:14 -04:00
coiax
372fe31908 Fixes bug where krokodil addiction wasn't horrific (#18075)
Now it makes you a fullblown addict, like it should.
2016-05-31 02:12:43 -05:00
oranges
96f74377b5 Merge pull request #17929 from coiax/zombie-bugs
Zombies are now a full subspecies
2016-05-31 11:52:59 +12:00
Jack Edge
1ba0fb5aee Infectious zombies are now a full subspecies
Fixes #17932

No more ""infection holder" bursts out of" memes, as zombie infection is
now done with a body egg in the head.

- Added 'romerol' a silent bioweapon reagent that adds the zombie
infection organ to a living person. This will lie dormant until they
die. Then they will stand up again.
- Zombie infection uses body_egg, meaning it shows up on healthHUDs.
- Zombies are now a full subspecies of humans, instead of
simple_animals. However, they should still be mostly the same, still
unable to pick up items, still zombify on attack and still able to claw
open doors.

Side Effects

- Zombies now take time to destroy tables
- Zombies can have their limbs cut off and be reduced to wandering
around being a bit pathetic. This is a feature.
- Zombies can be stunned and are vulnerable to stamina damage and
chemicals
- Zombies are armoured, but instantly die in crit, meaning they have
approximately 120 hp as before
- Zombie hands are just bloody hands, a proper sprite maybe sometime

gjkafldksfjkl
2016-05-31 00:15:10 +01:00
oranges
8c67b4f27b Merge pull request #18030 from coiax/fix-17831
Removes inconsistences with UMT and tesla
2016-05-31 09:56:47 +12:00
Mike Long
552fe03c93 Condiment bottles no longer lose their name upon refilling. 2016-05-30 13:51:27 -04:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges
89c27f7d04 Merge pull request #17980 from Iamgoofball/patch-48
Fixes infinite CLF3 fire
2016-05-30 11:02:22 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940)
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
Cheridan
737cddee68 Merge pull request #18018 from Xhuis/general_rabbits
Clockwork Post-Merge Patch II
2016-05-29 13:34:58 -05:00
Xhuis
d9a4277a8d A few urgent fixes 2016-05-29 14:08:29 -04:00
Kevin
bddd4aee3e godamn merges 2016-05-29 18:06:16 +02:00
Kevin
8c54f84d91 Merge remote-tracking branch 'refs/remotes/origin/master' into chem-bottles-rework 2016-05-29 17:47:43 +02:00
Kevin
b389fdfab5 adg 2016-05-29 17:32:03 +02:00
Kevin
a53a9f0616 Merge remote-tracking branch 'refs/remotes/tgstation/master' into chem-bottles-rework 2016-05-29 17:27:47 +02:00
Jack Edge
248e2c590b Removes inconsistences with UMT and tesla
- Unstable mutation toxin now acts normally on golems, and can turn
people into golems
- Because there are so many golem subtypes, the only non-blacklisted
golem type is /datum/species/golem/random which will select a random
name and ID and meatype from one of the others.
- Moved the check for a species siemens_coeff (electricity resistence)
down to carbon level, and make it always run. Now golems are immune to
all electricity; no other modification of siemens_coeff are in existing
species code.
- Added an "infinite" var to hyposprays (which includes epipens), which
causes it not to deplete its internal stock if true.
- Adds a species mutator epipen, admin only, used for testing all the
species stuff. A lot of sprites are broken.

🆑 coiax
fix: Free Golem scientists have proved that as beings made out of stone,
golems are immune to all electrical discharges, including the tesla.
/🆑
2016-05-29 12:53:53 +01:00
pudl
ee96a4f07e fix 2016-05-28 14:44:25 -05:00
pudl
1d7448486f fix 2016-05-27 22:31:03 -05:00
pudl
78295c04e7 colors 2016-05-27 22:16:55 -05:00
Iamgoofball
4365b8b513 Fixes infinite CLF3 fire 2016-05-27 18:12:26 -07:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
Kevin
bef2830f5f formating'n'stuff 2016-05-27 17:00:37 +02:00
Kevin
292e481402 removed obsolete hooks and other stuff 2016-05-27 14:21:58 +02:00
Kevin
68756489c2 First iteration of transparent Bottles 2016-05-27 12:34:23 +02:00
Kevin
602b0cc232 Different medical reagents get different pill sprites if they are the master reagent. 2016-05-27 11:37:42 +02:00
LatD
a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
Jack Edge
bc113b6aa2 Refactors NOREACT flag; minor cig refactor
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
LatD
f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
Kevin
50bdd0ba75 git git giiiiit 2016-05-25 14:38:56 +02:00
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
LatD
e7d5be221e Small fixes and changes 2016-05-24 23:04:00 +03:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
Kevin
bfd09ffbd5 git git git giiiiiit 2016-05-24 20:00:49 +02:00
Kevin
d1b817371c Whoa git stuff 2016-05-24 19:18:50 +02:00