Commit Graph

134 Commits

Author SHA1 Message Date
Vincent 16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
Vincent 05ae680b06 Fixing conflicts:
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Vincent 026e6ee772 Sets up the the ABSTRACT flag to be used by machines and structures that should not be disassembled or break into parts.
This is specifically used by the holodeck for things that should be immune to disassembly.

Fixes invisible windoors in the holodeck.
Standardizes the fire axe's interaction with windows.
Fixes a runtime with holodeck tiles getting broken or burned.
2015-11-26 21:11:54 -05:00
Firecage e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Firecage 618e54087d Makes abductor Optables not deconstructable. 2015-11-10 17:21:12 +02:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
xxalpha 36ae116a48 Added another mode for smoothing (smooth with all subtypes). 2015-09-23 00:55:10 +01:00
Swag McYolosteinen ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Fox-McCloud 89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
phil235 c069ea0a7d Fixes runtime in monkey/attack_hand()
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
phil235 94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
phil235 9eced1ac5b Fixes thrown closet opening to not use spawn().
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
2015-07-19 21:29:35 +02:00
phil235 7cd4a09ed7 Merge pull request #10592 from AlexanderUlanH/tables
Brings Tabling in line with newer stuns
2015-07-16 19:38:14 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Alexander P. Ulan Hernandez d7ee8b9032 Might as well fix this while there's a more controvercial PR 2015-07-13 08:51:37 -04:00
xxalpha 18d8cedf9b Transformed the datum into isolated procs. 2015-07-09 02:38:30 +01:00
xxalpha b74a65ff8a Working rwall decon icons, map editor iconstates, all smooth. 2015-07-07 22:17:25 +01:00
xxalpha 0b906c6916 All walls, fakewalls, windows, carpet. 2015-07-07 19:50:31 +01:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Jordie0608 7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
Remie Richards 751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
Mandurrrh 2ec53ea6c7 Adds the second block for table climbing before the first return. 2015-03-02 16:53:15 -05:00
Mandurrrh 43f1fc3fd6 Adds appropriate message for user and nearby mobs for being knocked off table. Also uses weaken instead of stun to physically knock the player over. 2015-03-02 08:07:52 -05:00
Mandurrrh 9013a8d0a2 Balancing out tableclimbing. 2015-03-01 20:53:22 -05:00
Remie Richards f7d3692a6b Clamps the value of pixel placed items between -(world.icon_size/2) and world.icon_size/2, so -16 and 16 respectively. 2015-02-26 23:17:59 +00:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Firecage 7fdd0556bb Updates to table/table frame deconstruction 2015-01-15 17:55:51 +02:00
Firecage 62ddab926f Fixes amount of mineral gotten from deconstructing tables 2015-01-15 03:31:56 +02:00
Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
phil235 70edf69f25 Fixes table having two mousedrop_T() procs.
Adding a rack_destroy() proc.
Fixes table blob_act and ex_act a bit.
2014-12-23 00:22:57 +01:00
Razharas 0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Razharas cd218a7ba3 Proper handling of computers and tables by c4
Proper handling of computers and tables by c4
2014-12-06 21:44:52 +03:00
Razharas 7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
phil235 d840fa74ac Makes table climbing while restrained take twice as long.
Making tablepush and climb_table procs a bit more oop.
Fixes typo in glass table climbing message.
Table-pushing someone is now logged.
Adding a check to table climbing to return if table is destroyed mid-climb
2014-12-02 23:25:36 +01:00
Razharas ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
hornygranny b6d0531c34 Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge
Fixes a glass table related exploit
2014-11-14 10:54:39 -08:00
paprka 85d879fbf4 Removes brute damage from tabling 2014-11-12 19:54:33 -08:00
paprka 020d28fe3b fixes a few glass table related bugs and adds more fun 2014-11-12 18:48:01 -08:00
paprka 56316c6129 bad placement for this particular line 2014-11-11 16:37:47 -08:00