Commit Graph

1240 Commits

Author SHA1 Message Date
Walter0o
955dfca291 removes sharpness from forks
too commonly available to enjoy the sharp bonus.
2014-07-13 08:59:41 -04:00
mwerezak
44e2f8acf2 Fixes human internal organs list
Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
Hubblenaut
b9be3e6ed7 Stops buckled mobs from slipping (for now)
Conflicts:
	code/game/turfs/simulated.dm
2014-07-13 06:48:17 -04:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -04:00
Chinsky
71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
2014-06-24 12:02:29 -04:00
Zuhayr
38559ab477 Makes forks usable.
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
2014-06-22 10:58:50 -04:00
mwerezak
c11e6ae106 Adds suit cooling device
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/clothing/spacesuits/ninja.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/life.dm
2014-06-21 17:23:30 -04:00
Necaladun
e138a3526f Combat knife
Added combat knife
2014-06-22 04:23:18 +09:30
ZomgPonies
0320b1a32e Fueltank explosions go to attack log 2014-06-20 16:26:27 -04:00
ZomgPonies
dedd110700 Send more stuff to attack log rather than admin log. 2014-06-20 13:42:42 -04:00
Chinsky
fc76ac01e0 Nextgen lighting #2: Lights
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-20 12:07:46 -04:00
Chinsky
3fa03af4cb Changes paint tile coloring to use color var, less icon procs. 2014-06-20 12:07:34 -04:00
Cael Aislinn
5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
mwerezak
3f6b32b15b Fixes #5186 2014-06-20 08:05:09 -04:00
Boop
f4cf6b3a0d Fix latex gloves box not having the right sprite 2014-06-18 22:15:34 -04:00
ZomgPonies
1132879810 Fixed up the stupid handcuff shit that's been bugging me forever. 2014-06-17 10:26:04 -04:00
ZomgPonies
22fa2cd3c4 Merge pull request #256 from Bone-White/master
Space Law book link fix
2014-06-17 07:54:38 -04:00
mwerezak
6ada0cf263 Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
ZomgPonies
88920b7235 Runtime fix / removing extra testing messages 2014-06-17 00:16:59 -04:00
ZomgPonies
f84214533a Removing even more unneeded test messages 2014-06-17 00:06:53 -04:00
Bone White
619cf8899d Space Law book link fix
Fixed the link in the Space Law book to correctly link to the printable
version of the space law page on the wiki.  Note that it uses Space_law
and not Space_Law on the wiki, as the font is smaller, but there are
some formatting errors on that page.  I can't edit the wiki page
directly to fix this because it's protected, but I wanted to keep the
smaller font to make it easier to read in game.
2014-06-16 14:04:17 +01:00
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Loganbacca
083cd19c6a New vehicle framework
- Implements a new vehicle framework
- Adds cargo trains

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-06-14 22:14:53 -04:00
ZomgPonies
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
ZomgPonies
fb5265d1b1 You forgot 2 commas, NOW I'm annoyed :D 2014-06-09 01:23:12 -04:00
Michael Slettevold
0a1b0af8f7 Fixed lack of Zippo volume 2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1 Fixed lack of Zippo volume 2014-06-08 20:19:33 -07:00
Michael Slettevold
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
ZomgPonies
0d57c3ef4d Tune bag choking 2014-06-06 00:06:17 -04:00
ZomgPonies
4683a12a35 Fix for storage bags 2014-06-05 22:17:01 -04:00
ZomgPonies
caaf56dbcc Bugfix for bag choking 2014-06-05 17:09:27 -04:00
ZomgPonies
b9fe3ab514 Added choking people with plastic bags. 2014-06-05 04:43:30 -04:00
Hubblenaut
70d96aedde Makes crashing into things possible with extinguisher or harm intent 2014-06-03 18:46:52 -04:00
Zuhayr
31a1b6e526 Fixes #5098
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
ChuckTheSheep
7491cd7b65 TC use count appears on round end
Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
2014-05-30 20:28:35 +02:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
ZomgPonies
581376e191 Nuke ops fixes 2014-05-26 17:57:39 -04:00
ZomgPonies
f36e5d206c Fix secborg tasers 2014-05-26 16:29:03 -04:00
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
Rob Nelson
a2cfa562b3 Fix UI syringes not setting UI flag correctly. 2014-05-15 20:10:47 -04:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
2d44352d0f Misc. changes 2014-05-04 09:37:28 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
Zuhayr
e79097add3 Several IPC adjustments.
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-05-03 17:42:01 -04:00
Zuhayr
31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe Adding some repair procs to cables and welders for IPC use.
Conflicts:
	code/modules/power/cable.dm
2014-05-03 17:37:46 -04:00