Commit Graph

14295 Commits

Author SHA1 Message Date
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
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
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
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
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
KorPhaeron
de89460706 Envy 2016-02-23 06:31:40 -06:00
KorPhaeron
9d208197ba Sloth 2016-02-23 05:05:11 -06:00
Cheridan
2901f3d8f0 Merge pull request #15684 from KorPhaeron/snowdin
Removes die of fate from snowdin
2016-02-23 01:48:03 -06:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
AndrewJacksonThe2nd
6a75d96966 Update chameleon.dm 2016-02-22 21:56:49 -08:00
Cheridan
b7d4e62100 Merge pull request #15668 from CosmicScientist/fixes_ss
Fixes rechargeable e-gun language
2016-02-22 21:59:45 -06:00
Remie Richards
f7cda70a6e Adds disconnect protection, I guess I'm not *that* mean. 2016-02-23 03:29:28 +00:00
KazeEspada
c130d04dfc Tiny mobs can't push shit. 2016-02-22 18:51:46 -07:00
Akke
72854bd973 Flies can no longer eat.
Flies must eat vomit.
Eating causes vomiting.
Janitors and Janitorborgs rollout.
2016-02-23 00:03:15 +00:00
Robustin
408a302b20 Update uplink_item.dm 2016-02-22 17:23:47 -05:00
Cheridan
34b6ff24b9 WITH A LITTLE BOW ON TOP 2016-02-22 16:01:26 -06:00
Robustin
b26337dc05 Update uplink_item.dm 2016-02-22 17:00:52 -05:00
AnturK
d282727fd5 Fixes mass modify for file type. 2016-02-22 22:42:41 +01:00
Robustin
f31cc6e6cf Update uplink_item.dm 2016-02-22 16:31:44 -05:00
Robustin
c535ea783e Update human.dm 2016-02-22 16:28:42 -05:00
Robustin
d9c6dfce73 Update mob_helpers.dm 2016-02-22 16:27:28 -05:00
Cheridan
0eaf4be081 PAPERCUTTER IS A ITEM NOW. CUT OFF YOUR HEAD WITH IT 2016-02-22 14:44:02 -06:00
KorPhaeron
b56b079ef9 Merge pull request #15669 from AnturK/hivelordcore
Fixes hivelord core healing
2016-02-22 13:56:28 -06:00
phil235
c424dfbcf9 Fixes a mistake in visible_message() code. Turf calling visible_message() now work correctly.
Fixes lighting cigarette message not appearing.
2016-02-22 20:46:19 +01:00
AnturK
4e0db5664b Adds /turf/template_noop and /area/template_noop to dmm reader 2016-02-22 19:24:45 +01:00
Robustin
320b1e958c Update mob_helpers.dm 2016-02-22 13:24:08 -05:00
AnturK
07432da284 Fixes off-by-one errors.
Adds template area preview
2016-02-22 19:09:31 +01:00