Commit Graph

24890 Commits

Author SHA1 Message Date
tkdrg ee42b2d051 Merge pull request #15652 from lordpidey/wallbuildfix
Fixes inability to construct walls with shuttlemetal
2016-02-25 15:29:58 -03:00
AnturK e045382022 Neater order. 2016-02-25 18:53:58 +01:00
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
KiwiFarms 8c41e37d3e * RPD now starts in pipe building mode
* Removed unused var
2016-02-25 13:51:11 +01:00
AnturK 68c0fc3173 Switches to overlay/temp 2016-02-25 13:11:08 +01:00
c0 6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
Steelpoint 628be2f67d C20rChange 2016-02-25 15:54:37 +08:00
KazeEspada 8aeb2678e0 You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts. 2016-02-24 23:15:19 -07:00
Shadowlight213 611dc19d65 Removes dupes 2016-02-24 21:14:18 -08:00
Shadowlight213 d71707989f fixes a return statement. 2016-02-24 20:45:47 -08:00
Shadowlight213 45065339d4 Adds rare children and void puppies to corgis 2016-02-24 20:43:56 -08:00
PKPenguin321 28795e2a28 buffs emp kit
implant has 3 uses up from 2
5 EMP grenades up from 2
2016-02-24 20:38:10 -08:00
Joan Lung 80c9101892 Merge pull request #15661 from AndrewJacksonThe2nd/PARANOIA
A TEAM OF NUKEOPS DISGUISED AS THE HEADS OF STAFF
2016-02-24 23:25:17 -05:00
AndrewJacksonThe2nd e7b8e81ab6 Update chameleon.dm 2016-02-24 20:19:45 -08:00
AndrewJacksonThe2nd dcbafb716b fixes 2016-02-24 19:33:37 -08:00
PKPenguin321 04b4955c2e better fix for sharpness override part
thanks kaze
2016-02-24 18:20:46 -08:00
PKPenguin321 cf29fdd8e1 sharpening blocks hotfix
makes things that are IS_SHARP_ACCURATE sharpenable, as well as things that are just IS_SHARP
makes sharpness not change unless it's a super-sharpening block
2016-02-24 18:15:13 -08:00
Cheridan 26731ee94e Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
CosmicScientist 4c34677a6b debuffs feel good factor, buffs my sanity 2016-02-25 00:34:24 +00:00
Leo ec90073b1d Add two lines
Oops.
2016-02-24 21:33:23 -03:00
Lzimann 89610b10fb Adds a way to quickly enable/disable CTF for admins. 2016-02-24 21:27:10 -03:00
CosmicScientist 81956d0083 fixes desc of riot armour 2016-02-24 23:41:10 +00:00
Akke b35db55305 adds new recipes/others.dm 2016-02-24 23:28:38 +00:00
Akke 505e070552 Still WIP due to oranges demand for it to be a proc. I don't actually know how to. 2016-02-24 22:56:44 +00:00
phil235 3ea7cf9831 The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag).
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
2016-02-24 22:56:54 +01:00
KorPhaeron c7b15dfb6a Checks for clothing 2016-02-24 15:37:10 -06:00
KorPhaeron ec8db75ebd Push block 2016-02-24 15:02:48 -06:00
KorPhaeron 62ce96e20e Adjacency checks 2016-02-24 13:20:12 -06:00
Nerd Lord 08b3c246e9 Blob event can now happen earlier.
Bonus; fixes a bug where blobbernauts spawned from factories would wander in the 5 seconds before they got a client
2016-02-24 12:10:00 -05:00
AnturK 978a18d476 Merge pull request #15699 from KazeEspada/cockroachpushing
Tiny mobs can't push shit.
2016-02-24 14:26:16 +01:00
AnturK 444b5ae9d5 Adds simple space vehicle 2016-02-24 14:14:20 +01:00
AnturK 2dca4811b6 Merge pull request #15686 from Menshin/bot_patrol_fixes
Bots patrol/summons tweaks and fixes
2016-02-24 14:11:09 +01:00
Razharas e9a347289b Merge pull request #15681 from PKPenguin321/patch-13
Tweaks stun/teleprod tablecrafting recipes
2016-02-24 14:47:31 +03:00
KorPhaeron 5bb50ed5cb nuke ops 2016-02-24 05:28:30 -06:00
KorPhaeron 66689856d3 Span classes 2016-02-24 01:09:53 -06:00
AndrewJacksonThe2nd 38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
KazeEspada f44a2ca210 Fixes Plasmamemes for realsies. Monkeys and Humans now breath all of their breath as long as they can process that gas. 2016-02-23 21:54:42 -07:00
Remie Richards abf466e9bc Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user.
Merge branch 'master' of https://github.com/tgstation/-tg-station into cursed_heart

Conflicts:
	code/modules/surgery/organs/organ_internal.dm
2016-02-24 02:33:22 +00:00
Remie Richards 4d1e3764e1 Merge pull request #15673 from phil235/ActionButtonUpdateRefactor
Action buttons will now only update when needed instead of every Life().
2016-02-24 02:01:15 +00:00
phil235 448ae3eeeb Fixes organ_action, they can now be named something other than "toggle [target.name]" 2016-02-24 02:49:47 +01:00
Incoming a302cc40e4 Persistence features for Runtiem
* Runtime now keeps track of all cats in the world, at the start of the next round any cats that survived the previous one will spawn with runtime in the CMO's office. This mechanic hinges on Runtime, so if she dies no other cats will spawn next round.

* After 9 death Runtime will be mysteriously missing from the next station (but only for that round).
2016-02-23 20:44:34 -05:00
PKPenguin321 2a2b9fa82d removes some now-useless code
by phil's request
2016-02-23 16:59:58 -08:00
KazeEspada ff45d89eac Fixes Plasmameme and breathed gases no longer go to turfs. 2016-02-23 16:18:41 -07:00
Razharas 746bbcf4ce Merge pull request #15696 from Robustin/MuhYakuzaEroticFantasy
Traitors can buy former Sleeping Carp Scroll for 17TC
2016-02-24 02:04:24 +03:00
tkdrg 377f187d53 Merge pull request #15691 from phil235/CigaretteMsgFix
Fixes a mistake in visible_message() code. Turf calling visible_messa…
2016-02-23 18:48:55 -03:00
tkdrg b408ecc067 Merge pull request #15697 from AnturK/memes_cannot_be_denied
Fixes mass modify for file type.
2016-02-23 18:47:32 -03:00
malkevin 8a627b9e66 Cuffs and sec clean up
Sometime last year sec officers lost one of the two pairs of cuffs they started with (I think its when the adv taser was added on spawn, cuffs used to be in the armor slot and were replaced by the taser but never placed anywhere else)
Seeing as cuffs are the only thing stopping sec officers beating the clown to death, I'm readding them.

I've also done a general clean up on sec lockers, removing the extra standard headset (why the f weren't these just replaced by the bowmans in the first place?), and stuffed the locker contents into the sec belts - because fuck the RSI inducing clickfest that is gearing up.
Reordered some of the contents of lockers, again for less repetitive clicks.

Gave the HoS a proper stun baton (I've notice most HoS's pinch a spare one from an officer's locker).
Swapped the detectives collapsible baton for a classic baton, seeing as they're as shit as collapsible batons now and fit the detective's film noir look better. Also gave him some pepperspray because its terrible enough for him to use.

:CL: Malkevin
tweak: Sec officers have two sets of cuffs again (one on spawn, one in locker)
tweak: Done some optimisation of sec spawn equipment lists and lockers to remove some of the repetitive clicking, sec belts are now preloaded with equipment.
tweak: HoS has a full baton instead of the collapsible one
tweak: Detective has a classic police baton and pepper spray instead of the collapsible baton (some made police batons shit, so don't get overly happy)
bugfix: pop scaled additional lockers spawned were the wrong type, changed them to the right type which has batons now.
/:CL:
2016-02-23 21:46:59 +00:00
KazeEspada cd4b5c17ea Tree Cutting. Implements stump sprites. Work in progress on cutting. 2016-02-23 13:57:10 -07:00
AnturK e22dddb50a Minor Improvements 2016-02-23 21:44:21 +01:00
phil235 57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00