Commit Graph

1566 Commits

Author SHA1 Message Date
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
2017-03-04 16:04:43 -05:00
Arokha Sieyes
05719b68b4 Update pill.dm
Spell it out fam
2017-03-04 14:00:43 -05:00
Yoshax
f54ae4be13 Makes the diet pill more effective, and makes Lipozine more effective in general 2017-03-04 16:25:32 +00:00
Yoshax
17197cd66a Makes food less filling so you can eat more in a reasonable fashion
Like being able to drink a protein shake when you're hungry and now end up in grey overfed for 9 hours
2017-03-04 16:17:55 +00:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Arokha Sieyes
2c493405bd More tweaks
Fix necrotic limb surgery
Make fever not so powerful that it resists cryotubes
All necrotic limbs produce toxins unless OD on spaceacillin, regardless of infection
Fix dropper use during surgery
Fix 'gap' in printable adv scanner infection reports
Fix nanoui template for adv scanner
Add examine text to gangrene and highly infected external limbs
Add flags to the MMI holder organs to make them robotic, and thus not infectable if they are > squishy MMI (posibrain, digital)
2017-02-28 01:13:29 -05:00
Yoshax
dad4e19785 Does custom food stuff 2017-02-19 01:02:12 +00:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
Anewbe
c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
Arokha Sieyes
b2499073d3 Remove adrenaline from vendor syringe 2017-02-06 19:59:03 -05:00
MagmaRam
f92e189cc7 Fixes not being able to pick up sandwiches with a fork if they're at max size. 2017-02-05 19:25:59 -06:00
Yoshax
f497cbf5cf Droppers are known for being inconsistent and inaccurate 2017-02-05 01:41:50 +00:00
Arokha Sieyes
94b621b310 Merge pull request #893 from Cameron653/master
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Cameron653
4a0913076c Travis should compile now 2017-02-02 18:56:37 -05:00
Cameron653
0eed3f1c34 Update Chemistry-Reagents-Food-Drinks.dm 2017-02-02 18:49:51 -05:00
Arokha Sieyes
2e6d423047 Fix chocolate milk
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
Cameron653
c3fe93e59c Coffee isn't toxic to taj now 2017-02-02 14:31:27 -05:00
Cameron653
f9fa4c71b3 Coffee isn't toxic to tajarans 2017-02-02 14:30:03 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Arokha Sieyes
4d79fe9a0e Fixes the pixels.
```
      ___           ___       ___           ___
     /  /\         /  /\     /  /\         /  /\
    /  /::|       /  /:/    /  /::\       /  /::|
   /  /:|:|      /  /:/    /  /:/\:\     /  /:|:|
  /  /:/|:|__   /  /:/    /  /::\ \:\   /  /:/|:|__
 /__/:/_|::::\ /__/:/    /__/:/\:\ \:\ /__/:/_|::::\
 \__\/  /~~/:/ \  \:\    \  \:\ \:\_\/ \__\/  /~~/:/
       /  /:/   \  \:\    \  \:\ \:\         /  /:/
      /  /:/     \  \:\    \  \:\_\/        /  /:/
     /__/:/       \  \:\    \  \:\         /__/:/
     \__\/         \__\/     \__\/         \__\/
```
2017-02-01 01:27:13 -05:00
Anewbe
1b3b67b8ca Merge branch 'master' into heart_damage 2017-01-30 22:43:09 -06:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
701695ba07 Changes two taste descriptions 2017-01-28 20:57:54 -06:00
Anewbe
9818b9a06f Fixes a type 2017-01-26 21:45:10 -06:00
Anewbe
6930f06030 Fixes some stuff 2017-01-25 15:59:40 -06:00
Arokha Sieyes
d9d4b338bd New "MKII" Hypospray
Adds a new hypospray to the game that uses 30u vials as 'mags' rather than requiring syringing.
2017-01-24 01:23:05 -05:00
Anewbe
83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Anewbe
10248f7677 Syringe code cleanup 2017-01-22 23:11:54 -06:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
9cbee4baf4 Ports taste 2017-01-16 17:07:41 -06:00
Anewbe
a379aa2779 Merge pull request #2911 from Anewbe/taj_chems
Applies various chem changes to Tajaran
2017-01-15 18:16:34 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Anewbe
d14096148a Adjusts removed, rather than strength for Taj things 2017-01-14 15:20:50 -06:00
MagmaRam
1351e5b013 Merge pull request #2890 from Anewbe/chem_spills
Fixes phoron/fuel spills not affecting the spilled-upon mob
2017-01-14 14:39:08 -06:00
Anewbe
397f812451 Corrects an error in the previous commit 2017-01-11 17:26:52 -06:00
Anewbe
4f70a0e942 Applies various chem changes to Tajaran 2017-01-11 17:09:35 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
5f1a99edfc Removes the last bit of Taj coffee poisoning 2017-01-03 14:28:18 -06:00
Anewbe
426bb55bfc Chems with touch_turf should now also do the proper touch_mob and affect_touch 2017-01-01 21:32:00 -06:00
Anewbe
24fcd2523b Farmbots can be constructed again 2016-12-31 17:16:34 -06:00
killer653
9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
MagmaRam
4d8c2aaa3e hurf durf dumb html mistake 2016-12-17 10:25:59 -06:00
MagmaRam
52f3ee7e19 Labels for beakers can now be longer, and are in the description, too. 2016-12-17 09:47:05 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
ForFoxSake
716c89b8cd Fixes water-cooler runtime. 2016-12-06 22:38:52 +00:00
Anewbe
1c7b32787b Skrell chem changes 2016-11-27 19:18:02 -06:00
MagmaRam
3f57783bf3 People will now process reagents when dead.
Most reagents are still skipped, but blood is, importantly, not.
This needs to be discussed further.
2016-11-24 00:31:20 -06:00
MagmaRam
4c533c0a74 Merge pull request #2745 from Anewbe/stimm
Adds Stimm, a homemade hyperzine; makes hyperzine toxic
2016-11-21 12:34:38 -06:00
Anewbe
c59f2a9711 Fixes the double use bug 2016-11-19 23:02:40 -06:00