Commit Graph

651 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
Dorsisdwarf
592553354f Merge pull request #12899 from TechnoAlchemisto/master
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
duncathan salt
383e77db8a Merge pull request #13220 from KorPhaeron/godwillsit
Adds knight armour
2015-11-27 13:58:08 -06: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
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
KorPhaeron
c8f3ca728f Adds Knight Armour 2015-11-25 15:46:54 -06: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
Cheridan
5f2ed41bc6 Merge pull request #12873 from KorPhaeron/zipties
Captain and HoP lockers now contain zipties
2015-11-10 08:03:53 -06:00
TechnoAlchemist
7b7a3cfd53 puts the new exosuit head of staff cloaks in their lockers. This time for real. 2015-11-07 01:28:44 -08:00
KorPhaeron
f332f595a2 zip ties 2015-11-05 18:03:12 -06:00
Nerd Lord
0f23809346 Revenant changes XVIII
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
Razharas
3cd68567ab Merge pull request #12754 from KorPhaeron/headsets
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
Razharas
aa3198afd1 Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!
Missing Diagnostic HUDs commit
2015-10-31 21:37:29 +03:00
Razharas
615275f71f Merge pull request #12496 from kingofkosmos/interactivescreenalerts
More interactive screen alerts and workarounds for the resist-button
2015-10-31 15:13:15 +03:00
KorPhaeron
354a03ea37 Headset 2015-10-30 05:30:42 -05:00
GunHog
336b57bd5a Missing Diagnostic HUDs commit
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
2015-10-30 00:45:31 -05:00
Cheridan
89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag
Moves biobags under biosuits
2015-10-28 16:37:19 -05:00
kingofkosmos
2c0f178e31 Embedded object -alert can be clicked to remove the object.
When handcuffed, a handcuffed-alert appears and clicking it is the same as clicking on resist. Same with legcuffing.
Moving in a Suit Storage Unit or welded/locked locker or morgue tray is now the equivalent of pressing resist.
2015-10-28 21:10:50 +02:00
Razharas
a59d4c47f0 Merge pull request #12234 from Incoming5643/flapping_intensifies
Modifies plastic flaps to defeat the secret box technique.
2015-10-28 19:39:45 +03:00
Razharas
980b3ec4a3 Merge pull request #12071 from KorPhaeron/captainqol
Small tweaks to captains starting equipment
2015-10-28 19:36:09 +03:00
KorPhaeron
fe6adf6cc1 Biobag 2015-10-27 16:13:43 -05:00
Incoming
ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies
Conflicts:
	code/game/machinery/computer/shuttle.dm
2015-10-24 23:32:55 -04:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
Cheridan
ecdaeaad4c Merge pull request #12540 from Incoming5643/this_blows
Syndicate bomb payloads will now detonate if set on fire
2015-10-21 19:11:05 -05:00
phil235
fb7ad8b38f Merge pull request #12452 from Xhuis/radical
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
phil235
d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Incoming
1db3c0c18b Syndicate bomb payloads will now detonate if set on fire long enough. Note that the casings for the bombs is fireproof, so if you want to set fire to a bombcore you'll need to remove it from the case first.
Fixes #12468 while I'm here to avoid another box pull
2015-10-20 15:52:38 -04:00
bgobandit
b554319d6a biobag hotfix 2015-10-19 18:02:57 -04:00
Razharas
6fc19c7c23 Merge pull request #12385 from bgobandit/morexenobioshit
Adds bio-bags, primarily for xenobiologists.
2015-10-19 19:53:45 +03:00
Steelpoint
3662a52eb1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Armoury
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-10-19 02:16:24 +08:00
Xhuis
9ac1395466 Adds geiger counters to radiation closets 2015-10-17 20:52:44 -04:00
bgobandit
cee7614cb7 Adds bio-bags. 2015-10-13 23:06:35 -04:00
Remie Richards
16db6f8cc0 Merge pull request #12299 from phil235/SlimeFeedBuckling
Slime feed buckling
2015-10-13 23:08:06 +01:00
phil235
7c6bbe328e Fixes some cases with mobs attached a mob. Can't enter a mech if attachment is done mid-climb. Can't get inside mech sleeper or closet if you have a mob attached to you. All sorts of teleports now properly teleport the attached mob as well.
Changed the warning message when climbing mech with a mob attached to be more general instead of specifically about slimes.

Getting inside a closet or machine now immediately breaks your pull and the pull of your puller.
Using ethereal jaunt now also immediately break your pull.

Fixes being able to get inside a mech sleeper while buckled by buckling mid-insertion.
2015-10-12 23:28:48 +02:00
phil235
a311e7a739 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeFeedBuckling
Conflicts:
	code/game/objects/structures/janicart.dm
2015-10-12 22:01:57 +02:00
phil235
3c788fcc59 Fixes Atmos fire helmets spawning in the wardrobe closet instead of the atmos closet.
Fixes Toggle Helmet light verb on security helmet with seclite attached being usable while dead.
Fixes Lizard snout is poking through helmet
Fixes Space helmets not hiding masks and glasses (especially the large gar glasses)
Eva harsuit helmet no longer has a semi transparent part (incompatible with hiding masks and glasses, and causes lizard snout protruding from that helmet)
Made equip_to_slot() and unEquip proc more OOP at the carbon level which removes some duplicate code between monkey and human.
Readding code\modules\mob\living\carbon\brain\login.dm that someone (probably me) unchecked some time ago by mistake.
2015-10-12 21:50:59 +02:00
Steelpoint
ca935350ef SRC 2015-10-12 12:42:34 +08:00
Steelpoint
ac57b4ee03 InitalCommit 2015-10-12 11:59:33 +08:00
phil235
df171284cb Slimes now uses buckling to feed and attach themselves on mobs. This removes the silly check in mob/Move(), reducing lag.
Fixes mobs being able to attach slimes onto other mobs.
2015-10-10 20:41:27 +02:00
phil235
9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Xhuis
406f727ead Armory remap, autorifle removal 2015-10-08 08:03:58 -04:00
Incoming
8de921832d Modifies plastic flaps to play nice with the secret box technique.
This code is ugly, but that's mostly because of how hidiously circumstantial plastic flaps are.

Always remember to use windoors with plastic flaps, as ways to get under them are still plentiful, box or no box.
2015-10-08 03:14:06 -04:00
Swag McYolosteinen
38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
Razharas
653e5d18f3 Merge pull request #12027 from Fox-McCloud/advancedmop
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Steelpoint
b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
KorPhaeron
7fa35114fa Captain 2015-09-28 20:16:08 -07:00
Incoming
7a4be0e04f Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-27 18:48:57 -04:00
Incoming
52123f879f There are no more random boxes
Maps now have two guaranteed spawns, one in maint and one in the cargo warehouse. You can still build more boxes yourself.

The ! easter egg can now only ever proc once per box. Once it's triggered that's the end of it.
2015-09-27 18:39:44 -04:00