Commit Graph

276 Commits

Author SHA1 Message Date
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR
Scale Ops 1.1
2013-11-24 13:51:07 -08:00
Giacomand
17fd5d6cdc * Fixes certain objects not using 3D sounds.
* Gave the piano a bigger falloff.
 * Capped the sound x/z to 7.
2013-11-21 23:50:53 +00:00
Cheridan
d814414227 Scale Ops 1.1
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
2013-11-20 17:59:02 -06:00
Aranclanos
ab566551af Merge pull request #1789 from havocx42/WindowPush
Attacking unanchored windows with a wrench turns them into stacks of glass
2013-11-20 11:19:16 -08:00
havocx42
a4e71ce1c0 Removed ..() from Del proc 2013-11-20 09:02:37 +00:00
Cheridan
bae3bcff3b Merge pull request #1801 from Giacom/explosion_sound
3D Sounds + Rewrote the explosion sound to be more optimized and to be more dynamic.
2013-11-19 15:49:45 -08:00
Laurence Reading
92c0f666f7 When removing a window the Deconstruct sound is played instead of shatter
Adds the ..() call to del()
2013-11-19 13:15:54 +00:00
Giacomand
c012a7aee3 Changed playsound() to use less code. Playsound now loops through the player list, which means you do not have to check inside closets/objects/other mobs to play sounds.
Made all sounds use 3D sounds! This includes sounds which have less volume the further away you are from it.
The piano now uses 3D sounds.
Changed how the far explosion sound is calculated.
2013-11-18 14:38:49 +00:00
Giacom
fc1211f1b4 Merge pull request #1803 from kyrahabattoir/examine-cleaning
Examine cleaning
2013-11-17 13:12:09 -08:00
Giacom
583cdb1781 Merge pull request #1763 from fleure/medmech
Fixed some container escape issues
2013-11-17 13:10:53 -08:00
Kyrah Abattoir
560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
2013-11-16 22:15:50 +01:00
Fleure
ecc10f6aea Refactored big package attack code 2013-11-16 20:56:23 +00:00
havocx42
be44497a09 removing unnecessary "/" from variant declaration 2013-11-14 22:54:23 +00:00
Laurence Reading
d753d524c2 Attacking unanchored windows truns them into stacks of glass 2013-11-14 22:17:01 +00:00
Fleure
05d5933137 Fixed being able to escape moving lockers 2013-11-14 18:42:13 +00:00
Aranclanos
2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2013-11-09 15:14:48 -03:00
Miauw
5ad9505ef4 [MAP]Fixed space-fastening properly.
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
2013-11-09 14:42:54 +01:00
Miauw
58f021626b Cleaned up bugfixes. Committed musician.dm too, I accidently forgot that. 2013-11-09 14:11:40 +01:00
Fleure
aaf68d2a12 Included additional structures to escape from 2013-11-05 00:26:30 +00:00
Cheridan
637e7f72c9 Nuke Op Population Scaling and Content Update
to be edited
2013-11-03 16:41:57 -06:00
sirbayer
c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07:00
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
Aranclanos
2888ade897 Merge pull request #1655 from Giacom/robot_violin
Added the space violin to the service cyborg modules + MORE [CHANGELOG]
2013-10-30 08:19:22 -07:00
AndroidSFV
3144b54e92 Fixes #633. Problem was a null.loc runtime from the chair being disassembled. 2013-10-27 19:37:38 -05:00
Fleure
d4aa482ff1 Changed locker escape message usage 2013-10-26 20:07:26 +01:00
Giacomand
83b882ed3f * Added the space violin to the service cyborg modules.
* Made the space violin usable by service cyborgs.
* You can now examine Cyborgs to see their active module.
* Made the choose module window look nicer.
2013-10-26 13:49:41 +01:00
Fleure
8eeafb70a7 Overrides statue resist proc 2013-10-24 22:25:29 +01:00
Fleure
e3169ee8b9 Adds container resist proc 2013-10-24 21:30:01 +01:00
supersayu
758c98c9e5 Adds a border object list to turfs
This removes some unnecessary or redundant checks in turf/Enter().

Also fixes a movement glitch involving atoms moving out of an object (locker, etc) and into walls.
2013-10-23 16:20:21 -04:00
supersayu
799c7ad2ce Replaces atom/HasEntered() with the builtin atom/movable/Crossed()
Crossed() is a byond builtin which is called automatically when two movable atoms overlap (as a side effect of Move(), but not when loc or x/y/z is changed).  Previously, turf/Entered() iterated through all objects in the turf in order to tell them an object had entered; with this change, HasEntered() becomes redundant and can be eliminated.

This may reduce lag when a large number of objects are moving in a small space (singularity, mining conveyors, etc) but should cause no changes to functionality at all.
2013-10-23 16:20:20 -04:00
Cheridan
9996ded1f8 Merge pull request #1609 from Neerti/bedsheet_bug_fixes
[BUGFIX] Fixes two minor bugs with my bedsheet changes.
2013-10-23 10:59:00 -07:00
Cheridan
02b62b4bed Merge pull request #1616 from Aranclanos/RuntimingSongs
Fixes a runtime related to songs
2013-10-23 09:31:28 -07:00
Aranclanos
89c3865a16 Fixes a runtime when a song tries to keep playing when the instrument was deleted 2013-10-22 03:47:49 -03:00
Neerti
1bdf2eec0c Fixes period in captain's bedsheet name and a graphical error with clown's bedsheet. 2013-10-21 13:58:05 -04:00
Cheridan
7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
Neerti
be3eeffded I can't into spelling. 2013-10-13 20:18:15 -04:00
Neerti
38341315d5 FIXED ISSUE WITH COLORS NOW BEING ITEM_COLORS WHO CHANGED IT WHY? 2013-10-12 21:03:57 -04:00
Neerti
6ffb6f1e20 Bedsheets can be worn, details in PR. Fixed merge conflicts hopefully. 2013-10-12 20:46:54 -04:00
Giacomand
796f3ca9f1 Merge pull request #1517 from Mloc/tg-byond500
[MAP] Refactors the code to work with BYOND 500.  Big commit.
2013-10-07 07:05:46 -07:00
Mloc-Argent
79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Giacomand
3b667227e5 * Made atmos_spawn_air() use flags.
* Replaced "fire" with SPAWN_HEAT. You will have to use it in conjunction with SPAWN_TOXINS to spawn fire.
 * Added flags for HEAT, COLD, TOXINS, OXYGEN, CO2, NITROGEN, N2O, FUEL and AIR.
2013-10-06 00:29:45 +01:00
Cheridan
ad6fa779b5 Merge pull request #1446 from Ricotez/airlockpainterfixes
Fixes and improvements to airlock painters.
2013-09-30 19:15:30 -07:00
Ricotez
5bd1a5bde7 -The airlock painter now shows a message when initially used on an airlock and out of ink/toner cardridge.
-Codewise the functionality of airlock_painter/use() was divided between two procs. Use() still works the same, but can_use() only checks if the painter can be used, without draining ink or playing sounds if it can.
2013-09-30 01:38:31 +02:00
Ricotez
b012829467 -Fixed being able to open the paintjob selection window and just walking away to paint the airlock from a distance.
-Fixed a few runtimes that could occur if the toner cardridge were removed while the paintjob selection window is still open.
-If you remove the toner cardridge from the airlock painter, it will now try to be put in your hand before falling to the ground.
2013-09-29 17:40:41 +02:00
Cael Aislinn
4ea0fe35b0 Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire
Mobs on fire: The return: The reckoning
2013-09-28 10:00:24 -07:00
Ricotez
0882d41574 Fixes and improvements to airlock painters.
-Airlock painter can now be used on finished airlocks to change their paintjob. Keep away from the Clown.
-Airlock painter description up to standards. It still shows the current ink level.
-Fixed a bug with painting airlock assemblies where painted glass airlocks deconstructed to assemblies reconstructed to airlocks would lose their glass status.
-Airlock painters now make a sound (effects/spray2.ogg) when used to paint an airlock.
2013-09-24 21:31:39 +02:00
Malkevin
c9d26c99f9 Removed the black mask, it really did look too much like a gimp mask.
Color scheme is now: HoS Red/Blue, Warden Red only, Officers White

Recolored the blue mask, should look much better now:
https://dl.dropboxusercontent.com/u/95696802/Commits/secmask/newblue.png

Moved the ..() in the departmental lockers after the departmental equipment so that they're at the bottom of the pile instead of on top, which was annoying
2013-09-21 23:49:42 +01:00
Cael_Aislinn
772acc95c4 mobs on fire system, by ergovisavi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-09-22 04:59:48 +10:00
Cheridan
cb3de0d038 Merge pull request #1371 from Malkevin/sechailer
Sechailer mask (now finished)
2013-09-20 13:47:12 -07:00
supersayu
a993ce62db Bugfixen and minor changes. Fixes #136.
Adjusts the click code to not use client/Click().  The code is largely unchanged, except that it allows the compiler default behaviour of calling atom/Click(), and then forwards the call to mob/ClickOn().  I had some reports that melee combat mixed with movement was behaving oddly, and I believe it may be due to the use of client/Click; the byond documentation says that redefining client/Click() causes additional overhead, and it isn't strictly necessary.

Alters the way double clicks are handled, in an attempt to better handle clickspam, as often occurs during pitched combat.  This may also be responsible for the above, but I don't know.

Inserts proximity (aka flag) checks in all afterattack() procs.  The old assumption was that unless an item used the USEDELAY flag, afterattack() was only called when adjacent, but this is no longer true.  This led to beakers, soap, crayons, etc, all being usable at all ranges.

Removes the NODELAY flag, which was unused.  Removes all existing uses of the USEDELAY flag so that it can be readded to things that need extra delay.

Removes the hand_* procs, previously used by restrained actions.  Instead, the mob helper mob/RestrainedClickOn() has abosrbed basically all the functionality they were used for, which is really only monkeys with jungle fever.

Adds a special case of the Adjacency() proc for doors.  This fixes #136, airlocks being unreachable due to border fire doors.  However, this only takes us back to the unpleasant position where you have to open-hand the door, switch to a crowbar, and pry open the firedoor; it still needs a better fix.
2013-09-17 18:19:14 -04:00