coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

2954 Commits

Author SHA1 Message Date
fleure ad27bc5200 Added GC check 2014-11-10 18:48:48 +00:00
fleure c0d858dccf Fixes nozzle deleting and adds some safety to nozzle toggling 2014-11-10 17:48:37 +00:00
hornygranny fa735ea9ed Merge pull request #5768 from paprka/mophands 
Fixes no inhand for advanced mop
 2014-11-10 08:16:22 -08:00
Swag McYolosteinen 9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +01:00
Menshin cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
paprka 0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm
 2014-11-09 14:53:19 -08:00
Ergovisavi 481a282ca8 Adds NODROP to the Atmos watertank nozzle. I have no regrets. 2014-11-09 13:56:12 -08:00
Ergovisavi 2c74fc8dbb -Adds secure atmos closets to Atmos 
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
 2014-11-09 11:16:58 -08:00
Steelpoint e02e2f5c0b TearGas 2014-11-10 02:16:46 +08:00
MrPerson c159878ace Throwing bugfixes 
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
 2014-11-09 00:29:20 -08:00
paprka 9be60df479 fixes no inhand for mop 2014-11-08 19:28:13 -08:00
hornygranny 62003a8ab8 Merge pull request #5700 from RemieRichards/SiliconLawCap 
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
 2014-11-08 15:22:09 -08:00
Ergovisavi 9c1366d65f Adds a new define for temperature protection for more robust firefighting gear 
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
 2014-11-08 02:14:37 -08:00
Cheridan 15b16e1f67 Merge pull request #5726 from paprka/traitorbeltthing 
Adds disguised med analyzer to medibelts
 2014-11-07 23:39:56 -06:00
hornygranny efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -08:00
paprka 7bde69c3a7 emagged defibs now make people gasp 2014-11-07 16:17:58 -08:00
paprka 774e82de06 Buffed weaken of safety off defibs and removed burn damage 2014-11-07 16:17:11 -08:00
Cheridan 594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization 
Text input sanitization (take 1)
 2014-11-07 13:56:20 -06:00
Cheridan e2bf3eca4b Merge pull request #5705 from Donkie/batonfix 
Fixes #5691 - Batons incorrectly giving messages
 2014-11-07 10:27:09 -06:00
Cheridan 3f16a966b2 Merge pull request #5712 from xxalpha/amilli 
Increases gold content per Robust Gold cigarette to 1
 2014-11-07 10:09:54 -06:00
paprka e5db75d756 adds disguised med analyzer to medibelts 2014-11-06 21:36:54 -08:00
xxalpha e1a06faa9b Increases gold content per Robust Gold cigarette to 1 2014-11-06 18:23:48 +00:00
paprka b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
Daniel 059244387f Fixed #5691 2014-11-06 01:12:15 +01:00
Remie Richards d1e0ef943c Changes messages to be more appropriate for last commit + more fluffy. 2014-11-05 23:31:51 +00:00
Remie Richards 198b9fee93 Extends the check to include the number of potential laws, from the current aiModule (eg, total_laws (10) + potential laws on board (4) = 14, 14 > 12) 2014-11-05 23:07:24 +00:00
Remie Richards 177225598b Adds a config option for capping the amount of laws silicons can receive via boards, defaults to 12 2014-11-05 22:25:46 +00:00
JJRcop bfc62a78aa Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals 
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
 2014-11-04 23:48:57 -05:00
paprka ff78a43bb7 fixes basically everything wrong with defibs right now 2014-11-04 19:33:41 -08:00
paprka 6efb62989f fixes defibs reviving and noclone check 2014-11-04 15:01:22 -08:00
Menshin b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
Ergovisavi 40e093de50 Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting 2014-11-04 10:52:46 -08:00
hornygranny b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
paprka f268f3d357 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 2014-11-03 18:31:43 -08:00
hornygranny e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns 
Acid Rework
 2014-11-03 18:11:49 -08:00
paprka 1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
hornygranny bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny 7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny 6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
hornygranny 0a0cd991de Merge pull request #5516 from paprka/telestunfix 
fixes telebaton stunning borgs
 2014-11-03 17:11:39 -08:00
Remie Richards c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns 
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
 2014-11-03 19:38:58 +00:00
Ergovisavi 46a3170b2a Firefighting changes: 
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
 2014-11-03 10:25:12 -08:00
Cheridan 51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
Cheridan 71fe1bf00b Merge pull request #5597 from phil235/IdMsgFix 
Fix the 'show ID' message.
 2014-11-02 11:10:16 -06:00
paprka 85de5f7cd5 initial commit for table overhaul 2014-11-01 23:57:01 -07:00
paprka 97a89b1162 Stun proc punctuation and compile error fix 2014-11-01 11:32:50 -07:00
paprka 17ea3d8641 adds stun to emagged defib 2014-11-01 11:28:51 -07:00
paprka 52d99e64ca noclone check 2014-11-01 11:23:51 -07:00
paprka 6acd73c835 changes emagging, punctuation, and emag stun 2014-11-01 11:20:05 -07:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00