coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,368 Commits 9 Branches 11 Tags
2dd321d349ae32fa7b527eb62d243cd1cf175f7b
Commit Graph

5537 Commits

Author SHA1 Message Date
Cheridan b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix 
Fixes drone and cyborg not being affected by mounted flashers.
 2015-07-20 11:53:03 -05:00
Cheridan 1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring 
Mech code refactor
 2015-07-20 02:00:11 -05:00
WJohn 001dd150e0 Merge pull request #10655 from MMMiracles/TWANG 
Adds a 'TWANG' sound effect for guitars
 2015-07-19 13:34:40 -04:00
Swag McYolosteinen a2f338cabf Merge pull request #10343 from GunHog/Borgie_Lights 
[Review] Cyborg headlamps!
 2015-07-19 19:26:09 +02:00
Swag McYolosteinen 0f244730bc Merge pull request #10626 from Ikarrus/lizardmov 
AI Module Updates
 2015-07-19 18:06:06 +02:00
GunHog f4407871ab Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
 2015-07-18 21:56:25 -05:00
Remie Richards 57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff 
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
 2015-07-18 03:45:38 +01:00
Cheridan a4a7c21744 Merge pull request #10653 from phil235/Fixarino 
Three simple fixes again
 2015-07-17 15:49:41 -05:00
Cheridan 41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix 
Shower Fix
 2015-07-17 15:34:29 -05:00
phil235 e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers. 
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
 2015-07-17 17:12:16 +02:00
Ikarrus bcbd4da656 Merge branch 'master' of https://github.com/tgstation/-tg-station into lizardmov 
Resolved Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
 2015-07-16 20:10:20 -06:00
phil235 7cd4a09ed7 Merge pull request #10592 from AlexanderUlanH/tables 
Brings Tabling in line with newer stuns
 2015-07-16 19:38:14 +02:00
phil235 9463dd7e70 Merge pull request #10613 from Ikarrus/rwindow-heat 
Reinforced windows and windoors are a bit more resistant to fires and blasts
 2015-07-16 18:42:45 +02:00
phil235 3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2015-07-16 14:09:12 +02:00
MMMiracles ca419e47c6 adds a 'TWANG' sound effect for guitars when hitting something 2015-07-16 07:59:10 -04:00
phil235 34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring 
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
 2015-07-16 13:50:01 +02:00
phil235 e968c9e03c Fixes dog bed dropping metal on deconstruction. 
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
 2015-07-16 13:04:44 +02:00
duncathan ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
 2015-07-16 04:27:25 -06:00
Firecage 2641e1a684 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Procs 2015-07-15 23:52:55 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Cheridan 92f728077e Merge pull request #10612 from Ikarrus/grenades_burn 
Fixes grenade casings burning forever
 2015-07-15 14:30:07 -05:00
phil235 5f7afb8782 Let's not spam people with drenching messages. 2015-07-15 20:08:53 +02:00
phil235 5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans. 
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
 2015-07-15 19:49:23 +02:00
Ikarrus d1175653dd - Reverts Map and Lizardmov changes 
- Asimov's subject can now be modified from "human beings"
- You can examine AI modules to check their laws
 2015-07-15 08:36:32 -06:00
Ikarrus c713797566 Makes it easier to check freeform boards by adding a cancel button to inputs. 2015-07-14 23:12:40 -06:00
Ikarrus ef548f6f67 Adds Lizardmov AI Module 2015-07-14 22:35:05 -06:00
phil235 de288d013e Merge pull request #10591 from bustygoku/Under-Pressure 
Tanks Show Pressure When Examined
 2015-07-14 15:51:47 +02:00
Cheridan a7b0b9c62f Merge pull request #10477 from ojacobson/screwdriverspamfix 
Fix consistency issues with eyeball screwdrivers
 2015-07-14 00:41:00 -05:00
Ikarrus 2bc5fd2db9 Reinforced windows and windoors are a bit more resistant to fires and blasts 
- Regular windows/windoors: 1073k
- Reinforced windows/windoors: 1873k
- Reinforced windows/windoors will count as walls for blast range calculation (The lowest possible value)
 2015-07-13 23:31:34 -06:00
Ikarrus 83a435273e Fixes grenade casings burning forever 2015-07-13 22:48:01 -06:00
Cheridan 723e6d6358 Merge pull request #10561 from xxalpha/hugboxone 
Adds an empty hugbox.
 2015-07-13 22:11:11 -05:00
bustygoku 4d0739c387 LowerCase K 2015-07-13 17:31:50 -07:00
Remie Richards f08d4f4085 Merge pull request #10554 from nukeop/rcdbugfix 
Fixes RCD-related issues
 2015-07-14 01:04:48 +01:00
phil235 359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring 
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
 2015-07-14 01:20:37 +02:00
phil235 72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
 2015-07-14 01:02:37 +02:00
bustygoku bde367b9b9 KPa Added 2015-07-13 15:30:21 -07:00
Alexander P. Ulan Hernandez d7ee8b9032 Might as well fix this while there's a more controvercial PR 2015-07-13 08:51:37 -04:00
bustygoku de699d3b5b Tanks Show Pressure When Examined 2015-07-13 04:09:39 -07:00
WJohn 37cfc11cd4 Merge pull request #10481 from Ikarrus/ganggangganggang 
Gang Mode Update
 2015-07-12 19:37:54 -04:00
duncathan 71ac607a6b Revert "merge conflicts?" 
I fucked this up
 2015-07-12 12:52:32 -06:00
xxalpha 66e2941531 Adds an empty hugbox for admins to give. 
Maintbox

Re-added hugbox to boxstation perma.
 2015-07-12 17:44:13 +01:00
Swag McYolosteinen 4878a7b8d5 Merge pull request #10531 from duncathan/rpddelay 
Speeds up RPD and pipe unwrenching
 2015-07-12 12:41:49 +02:00
Swag McYolosteinen 81ec442d50 Merge pull request #10512 from duncathan/traygoggles 
Adds t-ray scanner goggles for atmos techs
 2015-07-12 12:41:37 +02:00
duncathan 27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance 
Makes augmentations more difficult to maintain
 2015-07-11 19:54:58 -05:00
duncathan e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
WJohn 4be10fcce5 Merge pull request #10529 from xxalpha/smoothballs 
Fixed gases deleting all overlays of a turf when spreading.
 2015-07-11 20:27:22 -04:00
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix 
Fixes for lighter, heart attack, defib, light fixture and other stuff
 2015-07-11 19:01:04 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1 
Some fixes and stuff....
 2015-07-11 18:06:29 -05:00
barackobama f02c32c8ee fixes #10547, adds progress bars to grilles and windows, also fixes #9748 
I guess
 2015-07-11 19:49:32 +01:00