386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
96c15156c8
Changeling deathgasp fix
...
Now it will look like you actually died from regenerative stasis
2014-06-13 14:33:26 +02:00
192cc97158
Updating PR
2014-06-13 02:56:58 +02:00
57e8d921ff
Recommits storage
2014-06-12 16:28:19 -07:00
b6f12108e4
Nerfed combat borgs
...
Made the cell charge it costs to use the laser 500 instead of 100, since
it gave borgs WAAAY to many shots before they have to even consider
going back to charge
Fire delay also doubled, because we don't want them to waste everything
in two seconds, and it was way quick before, still considerabily fast,
though
2014-06-11 19:49:48 +02:00
23613661f9
Merge remote-tracking branch 'zomgponies/master' into Combat-borgs
2014-06-11 19:39:30 +02:00
22f4f9004f
Donator fluff item
...
Flagbearer's rebel outfit.
2014-06-11 15:52:01 +09:30
82ef708223
Removed inaprovaline fixing Internal bleeding
...
Because Inaprovaline has never had any healing effects, and seems to
only artificially give the body oxygen, as a replacement for not being
able to breathe, or so it seems, since vox takes toxin damage from it
2014-06-10 22:39:14 +02:00
8d9baa259c
Fix powerarmor slowdown situation
2014-06-10 03:32:50 -04:00
580c19e038
Machine people have no internal organs
2014-06-10 03:32:34 -04:00
e9dbeeab7e
Preferences fixes
2014-06-10 03:32:14 -04:00
1425001472
Bleh addiction
2014-06-09 19:01:10 -04:00
7fc8fdea05
Fix grabbing aliens grabbing yourself.
...
They were not updated to the new grab refactor when click code rework was ported.
2014-06-09 18:34:23 -04:00
a3bb74cf07
Powerarmor derp fixes
2014-06-09 17:51:16 -04:00
866c84a3d3
Moar addiction fixes
2014-06-09 17:51:05 -04:00
23f2885c01
Moar addiction fixuns
2014-06-09 01:54:03 -04:00
fb5265d1b1
You forgot 2 commas, NOW I'm annoyed :D
2014-06-09 01:23:12 -04:00
d1f2f9c361
Merge pull request #246 from BobTheBoss64/master
...
Added volume to Zippo lighters.
2014-06-09 01:09:24 -04:00
ff5ac9b8a3
Moar addiction fixuns
2014-06-09 01:08:30 -04:00
0a1b0af8f7
Fixed lack of Zippo volume
2014-06-08 20:20:56 -07:00
47ec7fc3f1
Fixed lack of Zippo volume
2014-06-08 20:19:33 -07:00
a30cd63810
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 20:14:33 -07:00
0e7ad2e4d5
Addictiveness fix
2014-06-08 23:00:57 -04:00
c7cf7650af
Powerarmor fixins
2014-06-08 22:19:41 -04:00
2c709df1da
Bugfixins
2014-06-08 22:04:16 -04:00
32e0776b2d
Merge pull request #245 from BobTheBoss64/master
...
Zippo sound effects and spelling fixes
2014-06-08 21:56:17 -04:00
2c57ec96ae
First commit of the addiction system
2014-06-08 21:55:03 -04:00
96fbad479c
Removes Impedrezene from the Paralysis Pen
...
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
2014-06-08 18:30:56 -04:00
0fc144ed35
Fix xenoarcheology field generator
2014-06-08 18:30:37 -04:00
f3df5a4a8a
Probability to bleed by airflow_hit lowered from 100% to 33%
2014-06-08 18:30:01 -04:00
544ff5f106
Fixes suit icons not updating when bloodied by airflow
2014-06-08 18:29:19 -04:00
e3d2a1716d
Fix syndi helmets thanks PPI
2014-06-08 18:18:14 -04:00
26a4b0a816
Missed some files.
...
Conflicts:
icons/mob/species/vox/gloves.dmi
icons/mob/species/vox/suit.dmi
2014-06-08 18:14:12 -04:00
dfce6736fb
Tons more vox clothes.
...
Conflicts:
code/modules/clothing/gloves/miscellaneous.dm
code/modules/clothing/masks/breath.dm
code/modules/clothing/shoes/magboots.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/suits/labcoat.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/species.dm
icons/mob/mask.dmi
icons/mob/species/vox/masks.dmi
icons/mob/species/vox/shoes.dmi
icons/mob/species/vox/uniform.dmi
2014-06-08 18:13:22 -04:00
ee56d75f52
Bandage Typos.
2014-06-08 17:38:06 -04:00
1d539848fa
Prevents diona nymph spam.
...
Conflicts:
code/game/machinery/podmen.dm
2014-06-08 17:30:07 -04:00
4aad7c1738
Modified power monitor to output to a formatted table.
...
Conflicts:
code/game/machinery/computer/power.dm
2014-06-08 17:27:28 -04:00
57eed9777c
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 14:17:37 -07:00
d3eeb7945d
Hotfix for Zombie Powder not ever clearing Fakedeath.
2014-06-08 16:24:48 -04:00
a271304044
Fix a runtime that occurs from closing the Clothing menu on a human.
2014-06-08 16:24:21 -04:00
23387777c2
Ian will stop making the MC wait for his movements
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-06-08 16:23:17 -04:00
8ad505e18c
Added abandoned drug lab to map.
2014-06-06 16:00:53 -04:00
4cfeada9d7
Added baggies for drugs, aww yeah
2014-06-06 04:16:39 -04:00
b23b5b62d9
Made hyperzine same color as salt, because HAHA
2014-06-06 02:43:38 -04:00
489cdf0096
Made hyperzine harder to make properly.
2014-06-06 02:35:10 -04:00
f370d92dfa
Boop
2014-06-06 00:45:10 -04:00
710f44bc55
Fix borg stunbatons
2014-06-06 00:06:28 -04:00
0d57c3ef4d
Tune bag choking
2014-06-06 00:06:17 -04:00
dc344d3d51
Update drone.dm
...
Typo fix and message trim fix.
2014-06-05 22:19:55 -04:00
4683a12a35
Fix for storage bags
2014-06-05 22:17:01 -04:00
ZomgPonies