Commit Graph

494 Commits

Author SHA1 Message Date
KorPhaeron f332f595a2 zip ties 2015-11-05 18:03:12 -06: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
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
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 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
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
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
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
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
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03: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
bgobandit df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Ergovisavi 5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00