Commit Graph

2045 Commits

Author SHA1 Message Date
Ergovisavi
40e093de50 Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting 2014-11-04 10:52:46 -08:00
Ergovisavi
46a3170b2a Firefighting changes:
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
2014-11-03 10:25:12 -08: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
71fe1bf00b Merge pull request #5597 from phil235/IdMsgFix
Fix the 'show ID' message.
2014-11-02 11:10:16 -06:00
Cheridan
4f58312d76 Merge pull request #5596 from phil235/LipstickFix
Fix for #5588
2014-11-02 10:39:21 -06:00
Cheridan
ef29aaef57 Merge pull request #5598 from phil235/PDAsoundFix
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -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
phil235
4803f099f6 Fix lack of sound when non-silent PDA receive message. 2014-11-01 15:32:48 +01:00
phil235
c8f3ad2dd0 Fix ID show message.
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
2014-11-01 15:17:43 +01:00
phil235
af767f2935 Fix being able to apply lipstick through masks and items covering the mouth. 2014-11-01 13:28:32 +01:00
Remie Richards
0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
GunHog
a216b7024e Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
Cheridan
1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
Remie Richards
07ff02b7c4 Merge pull request #5477 from MrPerson/space_movement_jam
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
GunHog
19ab2c4a2b Logic fix + Tweaks
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
MrPerson
e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
hornygranny
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
GunHog
d5081c07b9 Teaches GunHog how to spell!
"Disnable" -> "Disable"
2014-10-26 20:05:49 -05: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
tkdrg
ce73323823 Fixes #4311 2014-10-25 23:01:27 -03:00
GunHog
56959506ff Adds AI Integrated Radio
- The AI now has its own built in radio headset!
- The headset receives all department channels, including AI Private.
- AI Private can be accessed using :o, .o, #o, :O, .O, and #O.
- Carding an AI will automatically disable the AI's ability to transmit
on its radio.
*The AI's radio transmission ability can be toggled via the InteliCard's
interface
- Added instructions to newly spawned AIs such that they know how to use
their radio.
2014-10-24 20:33:07 -05:00
hornygranny
242621b87c Merge pull request #5422 from xxalpha/flashfix
Finish repathing flashes
2014-10-23 11:22:54 -07:00
phil235
b971a09bcd Wrapping something with package wrapper now gives a message.
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
GunHog
63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/ed209bot.dm
2014-10-22 17:49:52 -05:00
Hornygranny
72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
Conflicts:
	code/modules/mob/living/living.dm
2014-10-22 13:26:35 -07:00
xxalpha
a5450b0acb Finishes repathing flashes 2014-10-22 19:09:43 +01:00
GunHog
921143c078 ED-209 balance changes and bot tweaks
- ED-209's effective range has been reduced to 7, down from 12, to
prevent them attacking people off-screen.
- Ruthlessly nukes ".src" from the bot files, especially ed209bot.dm and
secbot.dm!
- Summoned bots now report on their department radio when summoned by
PDA.
- Bot radio frequencies now use the helpers instead!
- Officer Pingsky (On the MiniSat) is now set to declare his arrests on
the AI Private frequency, instead of Security.
- The remote_disabled var now prevents bots from being summoned or
controlled via PDA as well removing them from the AI's control panel.
- The AI can no longer re-activate a bot's remote control radio by
hacking it from the interface.
- The telescopic baton is now considered a safe weapon to carry and
wield by security bots.
- Added a small reminder to PDA users that bots can download access from
their ID to reach them.
2014-10-22 10:26:16 -05:00
GunHog
20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
2014-10-21 18:06:04 -05:00
Cheridan
a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1
closets can no longer contain a near infinite amount of mobs.
2014-10-21 12:15:30 -05:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
phil235
c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
phil235
56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
hornygranny
51277f03c0 Merge pull request #5203 from Menshin/href_stacks_multiplier_fix
Prevent href exploit with stacks multipliers
2014-10-20 19:34:04 -07:00
hornygranny
55ff8ab432 Merge pull request #5206 from paprka/usedcuffs
Used zipcuffs name change
2014-10-20 19:28:10 -07:00
Hornygranny
e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07:00
tkdrg
a6cf62a9e0 Merge remote-tracking branch 'upstream/master' into attackoftheturfs
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2014-10-20 17:27:02 -03:00
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
Cheridan
cb05cb64d1 Merge pull request #5306 from Aranclanos/flashruntime
Flashes runtime fix
2014-10-19 18:47:18 -05:00
Cheridan
4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
Cheridan
21b198dc2c Merge pull request #5314 from MrPerson/qdel_radios
Make radios garbage collect
2014-10-19 17:42:06 -05:00
tkdrg
cd5720b6a7 Floor refactor, try #1 2014-10-19 16:48:35 -03:00
xxalpha
091cbcca2c deleted bad lines 2014-10-19 04:57:14 +01:00
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
phil235
9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
MrPerson
ec9f595b1f Make radios garbage collect 2014-10-18 00:05:03 -07:00
Aranclanos
134c4d6209 Fixes a runtime with flashes when they burn out without user, now they'll display the burn out message from the src instead. 2014-10-17 16:42:51 -03:00