Commit Graph

921 Commits

Author SHA1 Message Date
Fox-McCloud 934550d268 Reagent Rebalance 2014-11-30 21:05:35 -05:00
Fox-McCloud 4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Fox-McCloud 9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
SamCroswell 8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Fox-McCloud 261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00
DZD ec98c3036f Missing Slime Reactions
Sepia, Cerulean, Bluespace, and Pyrite slimes now have reactions.
2014-11-24 20:01:54 -05:00
Markolie dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00
Markolie 3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Fox-McCloud dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud b0d73b0143 Merge pull request #450 from Bone-White/master
Disappearing Chemdispenser fix
2014-10-28 02:17:01 -04:00
Bone White dd8815049e Disappearing Chemdispenser fix
Found this age-old problem.  Doesn't update the sprite after the
explosion, but DOES stop it going invisible and non-clickable.
2014-10-28 06:10:02 +00:00
Fox-McCloud f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
melandor0 4a081070b3 Sec HUD fixes
Now reports beepsky and ED 209 arrest activity.
2014-10-24 21:16:00 +02:00
melandor0 d46266fcd8 More drugs 2014-10-22 04:49:42 +02:00
melandor0 546b6caf59 Preliminary new drugs 2014-10-20 02:52:54 +02:00
Bone White c8f0584063 Ryetalyn volume-based cure revision
As requested by Fox
2014-10-18 01:53:27 +01:00
Fox-McCloud 8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
Fox-McCloud 9c8326e120 Fix, Tweak, and Revise
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
Bone White d81a87363e Fix for Ryetalin
Cures on a chance based on volume of ryetalin injected, on_mob_life.
TURNS OFF ALL MUTATIONS!!

// 1 volume = ~2% chance
// 10 volume = ~17% chance
// 30 volume = ~38% chance

Returns SE to mob creation values (now set in dna2.dm)
2014-09-14 11:39:52 +01:00
VampyrBytes c0f5132664 Cleanup of internal organs
Both internal and external organs are a mess, which is making
maintaining and updating them nasty, so I'm cleaning them up, this is
the first stage

mechanical and assisted internal organs are now an object type rather
than a var in the organ which makes it much cleaner and easier to adjust

removed duplicate list of internal organs as there's no reason to have
the same objects in 2 separate lists

made New() a lot cleaner and more robust

External organs will be next
2014-08-21 10:24:13 +01:00
IcyV 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
Artorp 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
Artorp 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
ZomgPonies 8807058f9b Something I didnt add yet 2014-08-03 15:28:57 -04:00
Whitellama 6b1ba1b6a3 Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-08-03 15:28:20 -04:00
Zuhayr 23ef5530de Changed hydro trays, fertilizer and syringes over to use the reagent procs.
Conflicts:
	code/game/machinery/biogenerator.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	maps/tgstation2.dmm
2014-08-02 22:33:47 -04:00
ZomgPonies c1801306a7 Merge pull request #331 from VampyrBytes/master
fix for customizable foods
2014-07-27 12:00:09 -04:00
ZomgPonies d67de71db9 I had removed volatile_fuel, but it somehow came back. Fixed again now. 2014-07-26 19:06:18 -04:00
Zuhayr c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
VampyrBytes b2b443cc4d fix for customizable foods
names - no more meat, meat and egg sandwich sandwich sandwich type names
- this would now be an egg and double meat triple decker sandwich

commented sandwich.dm out. was almost duplicate code, but if a sandwich
was being made with a shard or customizable food, it was making it a
different object (/food/snacks/csandwich instead of
food/snacks/customizable/sandwich), only thing it processed that the
other didn't was if there was a shard in the food, which is now dealt
with in customizable
2014-07-26 07:25:47 +01:00
ZomgPonies a1da36611e I AM BEST CODER ARRRGH 2014-07-25 17:47:10 -04:00
Zuhayr ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Bone White edef61b2c7 More virology symptoms
Pain symptoms, and more antidepressant producing viruses.  Made a change
to the most powerful antidepressant, to make it break their mind more
often if over 5 units, to simulate overdosing of this potent chemical
2014-07-24 20:12:50 +01:00
Bone White 3d4dcd08c7 Overdose mini-patch
Stops sleepers giving people overdose amounts.
2014-07-24 03:38:53 +01:00
ZomgPonies 375a2b7645 Merge pull request #320 from IcyV/chemaddition
Expanded upon overdose system
2014-07-23 15:19:21 -04:00
IcyV 51033b9847 Expanded upon overdose system
Adds brute, burn, and oxy damage as potential overdose effects.
2014-07-23 12:14:17 -07:00
Ccomp5950 0beada11c7 Chem Master won't resize it's window by adding a scroll bar on selection.
Fixes #5574

Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
2014-07-23 09:01:57 -04:00
ZomgPonies f491b31d2b PR fixes 2014-07-22 20:05:26 -04:00
ZomgPonies 1812fe529d Merge pull request #315 from IcyV/overdose
Fixed version of a trial overdose system.
2014-07-22 19:45:06 -04:00
IcyV 6b4d2f7c82 Fixed version of a trial overdose system.
Applies basic toxin damage when a volume threshold is met.
2014-07-22 16:39:16 -07:00
VampyrBytes 4113b531af rewrite for DF/CM and grill
rewrite cos damn!

No more spam names... worst they can get is one of each type in a name.
CM won't accept anything that's been cerealized (at any point), DF and
grill will accept things that have been in them before, but you'll end
up with a burned mess, a cloud of smoke, and the chance of a small fire
2014-07-21 20:37:25 +01:00
IcyV 6198d9e9d9 Reverts hyperzine to its previous state, keep its addictivness
Revert "Made hyperzine same color as salt, because HAHA"

This reverts commit b23b5b62d9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made hyperzine harder to make properly."

This reverts commit 489cdf0096.

Removes Benazine

Revert "Nerfs for OD"

This reverts commit 4b94406efb.

Revert "Hyperzine fix"

This reverts commit d6702496f9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made Cyanide more deadly, added OD to Hyperzine"

This reverts commit 1cb87e07cf.
2014-07-21 03:15:14 -07:00
ZomgPonies 64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
ZomgPonies e2a9e93a59 Revert "Use IconProcs lib ReadRGB instead of another same functionality proc."
This reverts commit 11f1d82c65.
2014-07-19 11:43:48 -04:00
ESwordTheCat 11f1d82c65 Use IconProcs lib ReadRGB instead of another same functionality proc.
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
2014-07-19 11:19:52 -04:00
Zuhayr bdfc7ef719 Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 07:30:54 -04:00
VampyrBytes 34712ecc37 Fix for internal organ surgery
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
2014-07-16 20:17:50 +01:00
mwerezak a07b7a5ce3 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00