Commit Graph

625 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
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
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
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
Fox-McCloud 32cd0d49bb soap for the janitor 2015-09-27 07:07:27 -04:00
oranges 4ba7259666 Comment war continues
shake it off
2015-09-25 09:05:22 +12:00
Razharas 40e97a5f7b Removes the fun
Removes the fun
2015-09-24 23:58:07 +03:00
Razharas 3c4994749b Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction 2015-09-24 23:52:38 +03:00
Incoming5643 d2a1028a53 Patches up some animation mechanics misconceptions 2015-09-17 11:26:04 -04:00
Swag McYolosteinen 3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
phil235 e46f764113 Merge pull request #11623 from Fox-McCloud/qmvoucher
Adds Mining Voucher to QM's Locker
2015-09-14 19:59:47 +02:00
Incoming5643 ca101e4d82 Upgrades the anti spam flag to five minutes
Come in from downwind, then pull up fast! Get ready to fast rope down to Shell One! Five minutes to ETA! Alpha, your top priority is to rescue and safeguard the President! Team Bravo, watch out for Stillman's back, and get those C4's disarmed!
2015-09-13 19:10:59 -04:00
Thunder12345 6724b7bca7 Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured 2015-09-13 17:10:30 +01:00
Thunder12345 cf2d0903f6 Added a new formal jacket to the captain's locker 2015-09-12 21:10:16 +01:00
Incoming 585e678b41 Implemented Nienhaus' cardboard box sprite (pending apparently better sprite(s) coming)
Every roundstart generic locker now has a 20% chance of instead being a cardboard box (this is not the same thing as "20% of all lockers are now boxes" but it's a rough approximation).

As an easter egg, if you open a box containing a person everyone in sight will get a ! alert. This effect can only be triggered if someone other than the person in the box is the one who opens it. As a further safeguard against spamming this can happen at most once every minute.
2015-09-11 18:00:17 -04:00
Incoming 3ef306fc4e Adds large cardboard boxes to the game, constructable from five sheets of cardboard.
Cardboard boxes are closets that:
*Can only carry a single person
*Are easy to destroy
*Are flammable
*Can't be welded shut

They can also can be used for more "tactical" purposes, at the same speed as walking.

Takes the opportunity to remove some object unfriendly coding.

If this is accepted they'll be a pull a little later to replace a few closets on the maps with boxes (or maybe code to have generic closets on the map to occasionally spawn as boxes instead).
2015-09-10 19:29:19 -04:00
Steelpoint 6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Steelpoint d6f0c2484a InitalCommit 2015-09-08 19:56:07 +08:00
Fox-McCloud e8bccf6f0d Adds Mining Voucher to QM's Locker 2015-09-07 03:59:49 -04:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Cheridan 32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Ergovisavi 9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
Swag McYolosteinen 6b091e0cb6 Merge pull request #11086 from freerealestate/rcdrebalance
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
Remie Richards eedea4d281 Merge pull request #11018 from Core0verload/hammerspace
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
phil235 70a8046081 Merge pull request #10815 from bgobandit/bagtags
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
Jim Boonie a7b09a84ab - Made costs and delays variables
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12:00
c0 bd8d70ec26 New traitor item: storage implant 2015-08-04 18:28:38 +03:00
c0 600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
Jordie f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00