Commit Graph

618 Commits

Author SHA1 Message Date
hornygranny 0cf197ca95 Merge pull request #6050 from phil235/ReagentDispenserMsgFix
Fix reagent dispenser's message when empty
2014-11-25 12:41:12 -08:00
hornygranny 6786cd73f4 Merge pull request #6052 from phil235/GoldSlimeSpawnFix
Mining drones no longer spawns with gold slime extract.
2014-11-25 12:39:43 -08:00
phil235 16ea9974d9 Fix the empty msg of reagent dispenser not making it clear that it cannot be refilled. 2014-11-24 19:49:34 +01:00
phil235 795c905ea8 Mining drones no longer spawns with gold slime extract. 2014-11-24 17:59:57 +01:00
Razharas 9ebefa3efd Fixes pandemic disease naming
Fix #5817
2014-11-22 14:03:32 +03:00
Cheridan 8202db4227 Merge pull request #5755 from Miauw62/bughl
Fixes grinders opening their menus on range.
2014-11-14 14:50:46 -06:00
Ergovisavi 2c74fc8dbb -Adds secure atmos closets to Atmos
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
2014-11-09 11:16:58 -08:00
Miauw ef78be0595 Fixes grinders opening their menus on range. Fixed #4088 2014-11-08 15:28:32 +01:00
Remie Richards 2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
hornygranny e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns
Acid Rework
2014-11-03 18:11:49 -08:00
hornygranny 415e0e507f Merge pull request #5629 from TZK13/Hearing-Fixing-Chemical
Ports inacusiate from /vg/station, a chemical that instantly heals hearing damage and deafness
2014-11-03 17:50:20 -08:00
hornygranny 7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny 6e11157661 Merge pull request #5520 from paprka/minerscrubs
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
Remie Richards c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
TZK13 8663b35bf5 Ryetalyn now instantly stops jittering. 2014-11-02 17:31:41 -06:00
TZK13 571b476c98 Ports a chemical from /vg/station that instantly heals hearing damage and deafness. 2014-11-02 16:36:47 -06:00
Cheridan 51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
Cheridan 852d54df78 Merge pull request #5495 from phil235/ReagentSplashFix
You can no longer splash more than one turf/obj with a beaker/bucket by clicking quickly.
2014-11-02 09:33:48 -06:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
Remie Richards dfda08cc63 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/game/machinery/bots/medbot.dm
2014-10-30 06:32:13 +00:00
Remie Richards fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
paprka 1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
Remie Richards 9e2b813fac /acid type reagents now deal damage to limbs individually, stopping if opposed by a piece of clothing.
Pieces of clothing now reduce in protection when surviving an acid attack.
added a potentially useless helper.
2014-10-28 03:55:21 +00:00
phil235 2b3bec620a You can no longer splash more than one turf/obj with a beaker/bucket by clicking quickly. 2014-10-27 17:57:48 +01:00
paprka 3b24ac8fa9 removes useless spawn 2014-10-26 14:35:27 -07:00
MrPerson 2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam
Conflicts:
	code/modules/mob/living/living.dm
2014-10-25 23:25:27 -07:00
MrPerson ef6204656f Space movement rewrite to allow everything to drift
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
2014-10-25 23:19:46 -07:00
hornygranny 0cc07336d8 Merge pull request #5423 from phil235/PandemicMsgFix1
Adding a message to the pandemic computer
2014-10-23 13:17:20 -07:00
phil235 3a5eb0c1dc Adding a message to the pandemic computer whenever it cannot detect a virus in the blood sample (either due to stealth or actual lack of virus). This will make stealth virus less confusing to players. 2014-10-22 22:08:57 +02:00
paprka fdc3dfc85b Removes opencontainer flag from medipens 2014-10-21 13:53:27 -07:00
paprka 06478fcd86 [nerfingintesifies] 2014-10-11 08:04:35 -07:00
paprka 5124f32a70 revert combat hype 2014-10-10 07:50:44 -07:00
paprka d4e27ad955 reverted hardsuit change, added ignore flags 2014-10-09 20:28:27 -07:00
paprka b2ca9776fd expands medipens 2014-10-09 18:01:35 -07:00
Remie Richards 23651b54f0 Merge pull request #5093 from paprka/medipens
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
Cheridan f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
phil235 dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
paprka a92df04b4d changes for vendors and stuff 2014-10-04 23:13:34 -07:00
paprka 1bb6603ff4 replaces a lot of inaprov syringes with medipens 2014-10-04 22:03:09 -07:00
Cheridan 08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235 537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc.
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
MrPerson 651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Remie Richards b0827a189d Merge pull request #5025 from Incoming5643/summoneventfixerspecialer
Hopefully the final pass of initial tweaks and fixes for summon events
2014-10-03 14:34:56 +01:00
Incoming 13643b6607 Normal, Magic, and Holiday events will be seperated out on the trigger event menu
Fixes #5033

The invincibilty event won't cure benificial viruses
Fixes #5034
2014-09-30 14:08:01 -04:00
phil235 b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00
Swag McYolosteinen f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
phil235 1c93c09fdf adding a continue. 2014-09-19 18:21:30 +02:00
Jordie0608 40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
phil235 b756450d45 Fixes flash powder only checking for sunglasses protection.
Simplify the flashbang prime() proc a bit.
2014-09-17 22:48:02 +02:00