Commit Graph

24890 Commits

Author SHA1 Message Date
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 837e674bff Merge pull request #15604 from Steelpoint/SyndiShip
Remapping of Nuke Op's Ship
2016-02-23 01:56:43 -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
Remie Richards ebc485e38a Merge pull request #15400 from LanCartwright/viraladaptation
Adds Viral adaptation and evolution
2016-02-23 04:03:16 +00:00
Cheridan b7d4e62100 Merge pull request #15668 from CosmicScientist/fixes_ss
Fixes rechargeable e-gun language
2016-02-22 21:59:45 -06:00
AndrewJacksonThe2nd b81d8acda9 Update items.dm 2016-02-22 19:48:18 -08:00
Remie Richards f7cda70a6e Adds disconnect protection, I guess I'm not *that* mean. 2016-02-23 03:29:28 +00:00
Steelpoint ff5443201b Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip
Conflicts:
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
2016-02-23 10:18:21 +08:00
KazeEspada c130d04dfc Tiny mobs can't push shit. 2016-02-22 18:51:46 -07:00
PKPenguin321 80dbb567b4 rework
sharpening blocks can now only sharpen items that are already sharp, like knives, axes, etc. (super sharpening blocks don't care though)
max damage from sharpening is now 30 (no esword/ninja sword sharpening), increment is still 4 though
!!items can only be sharpened once!!
twohanded items (fire axes, spears) have their force when wielded increased rather than normal force increasing
2016-02-22 16:59:04 -08: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
KorPhaeron 1bfd3eae34 Better inhands 2016-02-22 16:36:47 -06:00
KorPhaeron 20e9b2a8e2 Fixes control wand access 2016-02-22 16:32:38 -06:00
Robustin 408a302b20 Update uplink_item.dm 2016-02-22 17:23:47 -05:00
Cheridan 04bf8d8651 Merge pull request #15670 from optimumtact/defibsonlystopheartattacks
Nerf the defib heavily
2016-02-22 16:20:06 -06: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
KorPhaeron d217b48ab3 Config does not work for spawning things in lockers 2016-02-22 15:42:07 -06: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
Robustin 9763db99de Update martial.dm 2016-02-22 16:20:10 -05:00
KorPhaeron b278741b19 Door remote config 2016-02-22 14:58:05 -06:00
Cheridan 0eaf4be081 PAPERCUTTER IS A ITEM NOW. CUT OFF YOUR HEAD WITH IT 2016-02-22 14:44:02 -06:00
Incoming c717c46fde The earliest a slaughter demon could spawn in a round sans wizard is now one hour, up from 10 minutes(!!!!!) 2016-02-22 15:00:09 -05: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
AnturK b56aefae74 Makes burglar alerts activate poddoors.
Adds generic lock/unlock helpers to /door
2016-02-22 19:08:43 +01:00
tkdrg 2f17bc0e2d Merge pull request #15645 from KorPhaeron/darby
Cursed Russian Revolver
2016-02-22 14:47:08 -03:00
Menshin 5533b54a0e * Cleaned bot patrol/summon logic regarding pathing retries
* Splitted navbeacons global list in several z_level lists
* Fixes navbeacons and deliverybeacons global lists being erased when a navigation beacon was destroyed
2016-02-22 17:56:34 +01:00
Cheridan c1f17f6cbf Merge pull request #15662 from tkdrg/ILOVETOPIC
Sanitizes a bunch of num inputs to be integers
2016-02-22 10:32:15 -06:00
Steelpoint 135e903410 Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2016-02-22 17:49:50 +08:00
Steelpoint b73e8ed9a5 FinalChange 2016-02-22 17:48:18 +08:00
Cheridan 9766395322 Merge pull request #15355 from tkdrg/yeah
Improves admin counting for irc
2016-02-22 01:27:43 -06:00
Cheridan 09252b4f4b Merge pull request #15657 from KorPhaeron/abductor
Abductor Airlocks
2016-02-22 00:05:15 -06:00
KorPhaeron 72c4becd95 Removes die of fate from snowdin 2016-02-21 23:25:04 -06:00
Cheridan d6d8f59db4 Merge pull request #15445 from Shadowlight213/Syndieboom
Fixes away mission loot station balance by removing loot drops from syndicate simple mobs.
2016-02-21 23:15:47 -06:00
KorPhaeron 03e205b7b1 Missing parantheses 2016-02-21 23:04:05 -06:00
PKPenguin321 8f2b3afd29 tweaks stun/teleprod tablecrafting recipes
removes the cell requirement from both, now you can craft one without a battery (but have to manually add the battery afterwords)
also changes the teleprod tablecrafting recipe to be consistent with the stunprod
2016-02-21 19:16:35 -08:00
Cheridan 685b197ecf Merge branch 'office_space' of https://github.com/Cheridan/-tg-station into office_space 2016-02-21 20:53:49 -06:00
Cheridan 0acbb3708c Adds flags
I'm going to murder you all, yes this is a written threat
2016-02-21 20:52:54 -06:00
Remie Richards 9401eb6b7d Added a wizard version of the heart, it heals the user every pump and only requires pumping every 6 seconds (vs 3)
Pumping successfully now returns half of the blood lost from a missing pump (anymore and I doubt you'd die)
You can no longer spam the pumping (healing made this a requirement)
2016-02-22 02:25:04 +00:00