Commit Graph

1626 Commits

Author SHA1 Message Date
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
phil235
be4b3a6857 Merge pull request #12478 from Firecage/Mirrorfixing
Adds fixing mirrors.
2015-10-22 19:16:55 +02:00
Firecage
40b149ade7 Removes one indent from the return. 2015-10-22 19:11:23 +02:00
phil235
c7670dc627 Merge pull request #12558 from Bawhoppen/medbaysigntypo1
Fixes medbay sign description typo
2015-10-22 12:41:26 +02: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
Lularian
40c9527211 Annoying desc for medbay sign 2015-10-21 09:31:39 -05: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
Razharas
123390d640 Merge pull request #12459 from phil235/BugFixBoogalooG
Phil's batch of fixes
2015-10-19 10:03:28 +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
Firecage
19d1f09511 Changes the user messages. 2015-10-18 18:14:47 +02:00
Firecage
86aa219825 initial() for the desc and icon_state 2015-10-18 16:40:00 +02:00
Firecage
124fba1d3b Enables fixing mirrors. 2015-10-18 12:47:14 +02:00
Xhuis
9ac1395466 Adds geiger counters to radiation closets 2015-10-17 20:52:44 -04:00
Cheridan
cb7642b969 Merge pull request #12417 from phil235/SmokeChange
Changes smoke to behave more like foam.
2015-10-17 10:07:04 -05:00
phil235
a7bc8475d8 Fixes winter coat hood sprite appearing as a bucket.
Removing Smile, Swedish, Chav and Elvis from genetics. These mutation can still be acquired via adminspawned dna injector. Added a dna injector for laser eyes mutation.
Fixes using razor on non human shaving non existent hair.
Fixes chair deconstruction dropping too much metal.
Adding some necessary check for mob buckling in gibber, processor and monkey recycler code, and in ventcrawling proc to fix being able to enter pipe while feeding as a slime.
Fixes snapcorn not giving seeds.
Fixes portable chem dispenser.
2015-10-17 16:29:11 +02:00
Razharas
fce9bcc646 Merge pull request #12340 from Shadowlight213/Mirrormagic
Adds a lesser magic mirror limited to human and lizard race
2015-10-16 09:31:16 +03:00
Razharas
c44c6d90be Merge pull request #12350 from AnturK/ironwall
Rough Metal Walls
2015-10-16 09:08:00 +03:00
phil235
47909d525f Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.
Also smoke reaction now uses the TOUCH method instead of VAPOR, to differentiate smoke and foam. Mob without internals or gas masks also ingests reagents in the smoke.
Moved nanofrost smoke code to effects/effect_system/effects_smoke.dm
2015-10-15 21:52:37 +02:00
bgobandit
8b60afcaf2 toilet related tweaks and fixes 2015-10-14 11:48:47 -04:00
bgobandit
cee7614cb7 Adds bio-bags. 2015-10-13 23:06:35 -04:00
Shadowlight213
b3693e15ca Changed to use roundstart_species list 2015-10-13 19:24:32 -07:00
Cheridan
b847f6c91f Merge pull request #12323 from phil235/BugFixBoogalooE
Bugfixes, again
2015-10-13 17:08:37 -05: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
AnturK
c73526334c Rough Metal Wall 2015-10-12 18:47:22 +02:00
Shadowlight213
6146aa156d Adds a lesser magic mirror that only allows for human and lizard race changes 2015-10-12 01:04:30 -07:00
Steelpoint
ca935350ef SRC 2015-10-12 12:42:34 +08:00
Steelpoint
ac57b4ee03 InitalCommit 2015-10-12 11:59:33 +08:00
phil235
c19d1c1427 Removed unused code in hologram.dm
Fixes displaycase when you could put a new item in it w/o first removing the first one.
Fixes parrot going through windows when getting on its perch, and some other cases of in_range() instead of Ajacent().
Fixes not being able to change transfer amount of reagent containers while buckled.
Remove unused sprites in stationobjs.dmi
2015-10-11 20:18:13 +02:00
phil235
7706b8f870 derp, let's not make janicart unbuckling runtime.
Also renaming obj/effect/spacevine/buckle_mob() to entangle_mob() since it's not really the standard buckle_mob() and could cause runtimes.
2015-10-11 14:08:06 +02: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
Razharas
297c5d7d4e Merge pull request #12247 from CosmicScientist/ThreeGrammarFixes
Cigs, urinals, infrared lasers, oh my!
2015-10-10 03:29:42 +03:00
Razharas
08d73f71c9 Merge pull request #12240 from phil235/BugFixBoogalooD
some simple Bugfixes
2015-10-10 03:26:45 +03:00
Razharas
8d3b1ac018 Merge pull request #12202 from Xhuis/autorifle_removal
Armory re-mapping and autorifle removal
2015-10-10 03:21:52 +03:00
CosmicScientist
58f6c961e4 Cigs, urinals, infrared lasers, oh my! 2015-10-08 22:45:09 +01:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
Cheridan
136140614d Merge pull request #12151 from AnturK/larvafix
Misc Fixes
2015-10-08 07:20:30 -05:00
Xhuis
406f727ead Armory remap, autorifle removal 2015-10-08 08:03:58 -04:00
AnturK
75e82f15f2 Return for buckling procs
Makes unbuckling priority over removing bag in janicart
Makes doors bumped in janicart open.
2015-10-08 13:40:53 +02:00
Razharas
7aae089d5a Merge pull request #12094 from AnturK/mapcase
Adds support for custom showcases on the map
2015-10-07 22:26:43 +03: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
AnturK
b7a1ee7cfa Adds display case repair 2015-10-05 13:07:58 +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