93f3f7b5ed
Chem and overdose patch.
...
Raises general overdose amounts. Lowers brute/burn damage from overdose. Removes the secondary anit-tox.
2014-08-10 03:16:32 -07:00
896021c967
couple of fixes
...
fixes MP's ending up with 2 heads on death
fixes cloning machine cloning species that are meant to be uncloneable
2014-08-10 11:11:21 +01:00
f8ed5bf6b6
Sync Changes from Paradise Master
...
Sync changes
2014-08-09 18:48:19 -04:00
c497d8e1a9
Tajaran and Unathi shoes
...
Stops Tajarans and Unathi from wearing sandals if they are a cyborg (no
feet) or a clown (clowns have large shoes)
2014-08-09 18:41:40 -04:00
7ac1d76f80
Fixes equip_or_collect
...
Equip_or_collect fixed to not delete the item being equipped.
Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag. However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
2014-08-09 17:53:18 -04:00
808e908dc6
Merge pull request #365 from Artorp/chemisty-changes
...
Chemisty quality-of-life changes
2014-08-09 22:34:54 +02:00
14f3bc7529
Added pda to strip menu
...
PDAs can be stripped off or placed on a uniform now without having to
remove the uniform.
2014-08-09 17:45:31 +01:00
32d14b8307
Medical belt can load into fridge
...
- Fixed compiling error with glass.dm
- Medical belt will load apropriate items into the medical fridge when
used on the fridge
2014-08-09 03:18:31 +02:00
4c59644d95
Enable medical belt quick pickup
...
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
2014-08-09 02:51:15 +02:00
7b61b6563a
Merge pull request #363 from Bone-White/master
...
Added procedural slow to EVA suits
2014-08-08 03:17:19 +02:00
3e285690ae
update for procedural eva slow
2014-08-08 02:11:44 +01:00
9ffa4b8ee7
Added procedural slow to EVA suits
...
Slow increases as pressure around them increases. At higher than 80kPa
the slow is 4 units (as compared to diona's natural slow of 5)
2014-08-08 01:39:42 +01:00
a812f3896c
Vampyr, ya dun fucked up. Test your commits next time.
2014-08-07 20:19:42 -04:00
852f89dd0b
Merge pull request #362 from VampyrBytes/master
...
fix for #248 number 2
2014-08-07 03:51:24 -04:00
e4d2cb53e4
Merge pull request #359 from Bone-White/master
...
Rubber bullets now cause agony/halloss instead of stun
2014-08-06 19:04:35 -04:00
6e67faf4fc
Merge pull request #358 from VampyrBytes/master
...
More MP fixes
2014-08-06 19:04:26 -04:00
bbc9e51679
is_in_brig() fixes
2014-08-06 23:42:54 +02:00
a4196cb745
Add Vox Heist directive and call shuttle on completion of Directive X
...
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
f63a1995b8
Rubber bullets now cause agony/halloss instead of stun
...
As title, by Mel's request. Makes sense with the stunbaton nerf to nerf
rubber bullets too. Two shots cause incapacitation (as opposed to three
from a taser).
2014-08-06 20:41:31 +01:00
8504a13e33
fix for #248 number 2
...
Last fix didn't work, this one should though
2014-08-06 08:06:41 +01:00
415013ef22
Merge pull request #357 from VampyrBytes/master
...
fix for #248
2014-08-06 01:34:20 -04:00
d388e0b069
Merge pull request #356 from Regory/scoreboard-mining
...
Scoreboard mining
2014-08-06 01:33:46 -04:00
5b04ef3385
Merge pull request #355 from Bone-White/master
...
Pipe wall drilling fix
2014-08-05 20:34:01 -04:00
3c4db5076a
Better adminlogs for virus mutations in mobs
2014-08-05 22:46:38 +01:00
dc2bf43c11
Added adminlog to virus mutations in mobs
2014-08-05 22:39:15 +01:00
26acad361e
Added Admin PM by Key verb
2014-08-05 16:38:37 +01:00
5377a879b8
More MP fixes
...
removed immunity to pressure that was added with overheating
MP will now revive when their heads are reattached
2014-08-05 10:48:21 +01:00
db4a165244
Turned heavy laser into a kind of laser minigun. Still more bang for your buck than a regular laser
2014-08-05 00:11:57 -04:00
3a3e8ac7be
Fix grey eyes, add bitching when hairstyles are invalid.
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/new_player/sprite_accessories.dm
2014-08-04 22:29:38 -04:00
a78316732f
Fix compile.
2014-08-04 22:23:26 -04:00
7e8c1cf7fe
Plasmamen ignite when not wearing their suit.
...
Conflicts:
code/modules/mob/living/carbon/human/human_defines.dm
2014-08-04 22:23:11 -04:00
ce7d05ccf3
Fix errors from ticker initializing after map ore
...
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level). The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.
This also means that ore mined on the Clown Planet don't count.
2014-08-04 16:24:00 -04:00
109754ac2b
Track Ore Mined for Scoreboard
...
Increments the score for ore mined each time ore is mined (i.e.:
spawned) after the game starts.
2014-08-04 12:00:44 -04:00
bb2c311b28
fix for #248
...
Don't close #248 yet though, need to test this one on the main server -
kinda tricky to perform surgery on yourself ;)
2014-08-04 08:20:47 +01:00
509af0b236
Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun
2014-08-04 01:54:27 -04:00
a3fdd71012
Forgot an event verb for seniormins
2014-08-03 22:08:41 -04:00
c22ea7a5c0
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 16:15:47 -04:00
90e0da92cc
Removes duplicate code from human/bullet_act
...
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living_defense.dm
2014-08-03 16:15:10 -04:00
8829bca02b
Cleans up weapon embedding code
...
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-08-03 16:11:04 -04:00
2c7926eff8
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 16:09:38 -04:00
3eae360963
Handcuffs now require an aggressive grab
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
ee9fe24083
Fixes siemens coefficient not blocking stun disarm
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:02:47 -04:00
321598a8a1
Makes humans scream if taking enough halloss
2014-08-03 16:01:04 -04:00
279718728f
Allows the use of stun weapons to show up in autopsies
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:00:48 -04:00
bbdd4641d0
Adds disarm effect for stun weapons and hands
2014-08-03 15:59:39 -04:00
f43a3ead70
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
64638987dc
Adds siemens_coefficient handling to stun batons
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:54:34 -04:00
ac0e3966d6
Taser cleanup and fixes
...
Fixes cloaking devices and deadman switches being included in taser code
somehow.
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 15:47:21 -04:00
0dc07bafa1
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
Conflicts:
code/_onclick/item_attack.dm
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:40:19 -04:00
8807058f9b
Something I didnt add yet
2014-08-03 15:28:57 -04:00
IcyV