coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,645 Commits 9 Branches 11 Tags
0570ec92c76c66001089b53fa3143a48bb526ea7
Commit Graph

15787 Commits

Author SHA1 Message Date
Orange Borg 0570ec92c7 Fix electronics check in airlock code 
Because needhand defaults to 1 (on) it was always returning false as the item was dropped before the do_after check
 2015-04-10 21:42:57 +12:00
Cheridan 69f1b38479 Merge pull request #8838 from optimumtact/hearmeroar 
Fix megaphone having an audible range of one
 2015-04-10 01:01:57 -05:00
Cheridan 4804ef1f01 Merge pull request #8843 from Wolfie13/MyFavoriteItem 
Added Description Text for Pet Collars
 2015-04-09 23:50:02 -05:00
Jordie 40d1c3e347 Merge pull request #8863 from Iamgoofball/patch-53 
Fixes slime core dupe bug
 2015-04-10 14:38:25 +10:00
Cheridan 23f31693fa Merge pull request #8739 from phil235/FoodRecipes2 
A whole new bunch of foods and drinks
 2015-04-09 23:28:31 -05:00
Iamgoofball 16a25f3dd8 Fixes slime core dupe bug 
why the fuck this didn't throw an error is beyond me.
 2015-04-09 20:49:07 -07:00
hornygranny 761985ce80 Merge pull request #8801 from xxalpha/fixfixfix 
Implant Hotfix
 2015-04-09 13:45:32 -07:00
phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	icons/obj/food.dmi
 2015-04-09 17:38:14 +02:00
phil235 c786ca7c54 Merge pull request #8814 from Fayrik/AllTheSmallThings 
I dun goofed.
 2015-04-09 17:08:53 +02:00
phil235 06f09fcd81 Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard 
Icon_door customability fix
 2015-04-09 14:27:30 +02:00
phil235 ddb5ffe324 Merge pull request #8582 from Xhuis/two_devices 
Adds pizza bomb
 2015-04-09 12:58:57 +02:00
phil235 b4616ad09b Merge pull request #8731 from optimumtact/patch-2 
stun batons no longer lose charge over time
 2015-04-09 12:51:40 +02:00
bear1ake 3ed097265f Fix #8851 
also fixes unbucking and cuff breaking.
 2015-04-09 17:18:22 +09:00
Jordie0608 a405022ac9 State fixes 2015-04-09 16:27:39 +10:00
Cheridan 53775cee74 Merge pull request #8775 from Incoming5643/PLEASE_MULLIGAN_WE_CAN_WORK_THROUGH_THIS_I_LOVE_YOU_MAN_PUT_DOWN_THE_GUN 
Fixes another instance where the mulligan system just starts screaming at admins instead of doing anything
 2015-04-09 00:29:04 -05:00
Cheridan e170ee88ce Merge pull request #8804 from AnturK/signsdelay 
Adds delay to picket sign waving
 2015-04-09 00:26:08 -05:00
Cheridan 58a362b2f1 Merge pull request #8822 from sawu-tg/blackface 
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
 2015-04-09 00:20:23 -05:00
Cheridan e31859a37e Merge pull request #8734 from MrPerson/holidazed_and_confused 
April Fool's lasts only 2 days plus another holiday
 2015-04-09 00:15:24 -05:00
Cheridan 3bee31dd7f Merge pull request #8687 from phil235/ProjectileFix1 
Makes projectile non dense.
 2015-04-09 00:12:56 -05:00
Wolfie13 22deb5b46e Added Description Text for Pet Collars 
Because we know they're not some sort of space-tie.
 2015-04-09 04:15:38 +01:00
Remie Richards 6c1a7eba8f Merge pull request #8732 from optimumtact/targethelper 
Add an optional target var to the do_after helper
 2015-04-09 03:02:35 +01:00
oranges 8a5696a033 Fix megaphone having an audible range of one 2015-04-09 10:57:30 +12:00
phil235 939b5552ad Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake 
Fixes #8529, confirmation check for BoH bombing
 2015-04-08 20:01:35 +02:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
 2015-04-08 19:36:49 +02:00
phil235 a0ea5dfefe Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/hostile/bees.dm
 2015-04-08 19:10:20 +02:00
AnturK 0685e87341 - Adds delay to picket signs 2015-04-08 16:21:19 +02:00
Jordie0608 24d047a116 icon_door customability fix 2015-04-09 00:05:16 +10:00
Cheridan 633dc259dc Merge pull request #8751 from MrPerson/kudzu_more_like_crapzu_amirite 
Give kudzu mouse_opacity 2 so clicking them is easier
 2015-04-08 09:04:17 -05:00
Cheridan c5f6f5ff2c Merge pull request #8812 from Jalleo/Removal 
Removal of empty file
 2015-04-08 08:44:43 -05:00
Cheridan f537b43108 Merge pull request #8789 from phil235/BeartrapFix 
Pull, resist, beartraps
 2015-04-08 08:38:01 -05:00
Jordie0608 ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
 2015-04-08 22:51:45 +10:00
Jordie0608 ffbef1f7d9 inversed check fix 2015-04-08 16:22:51 +10:00
Jordie0608 60cf76c881 fixes 2015-04-08 16:11:56 +10:00
Jordie0608 37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
Sawu 6103b2a5e1 Fixes Spraycans not coloring faces correctly 
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
 2015-04-08 15:02:32 +10:00
Cheridan 4554d54229 Merge pull request #8765 from phil235/UdderFix 
Fixes goat not producing milk and not retaliating.
 2015-04-07 19:29:12 -05:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Xhuis 2cb387af90 Adds proximity/stat/etc. check and removes bloat 2015-04-07 19:52:14 -04:00
Iamgoofball 54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
Fayrik 98b5f41770 As you can see, I'm an idiot that codes potential infinite loops. (But I also fix it too.) 2015-04-07 21:48:00 +01:00
phil235 028b40ecd1 I hate fixing merge conflicts. 2015-04-07 20:51:47 +02:00
phil235 6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix 
Conflicts:
	code/modules/mob/living/living.dm
 2015-04-07 20:27:37 +02:00
phil235 34a2b3be5b Flying animals no longer triggers mines and mousetraps. 
Space carps are flying animals now.
Adding changelog
 2015-04-07 20:20:29 +02:00
blah af99eea983 okay 2015-04-07 18:57:30 +01:00
xxalpha 09067eac4f Removed Reviver implant. Commented out some implant designs. 2015-04-07 07:52:07 +01:00
hornygranny e957233907 Merge pull request #8772 from MrPerson/foam_fixarooney 
Fixes cleaner grenades
 2015-04-06 16:09:35 -07:00
phil235 d60df6ea2e Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1 
Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm
 2015-04-07 01:06:38 +02:00
phil235 1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
 2015-04-06 19:38:51 +02:00
phil235 ad797d405e Better parsnip sprite 2015-04-06 19:25:27 +02:00
phil235 dd1dac556b Fixes a mob's pull not being broken when that mob is thrown. 2015-04-06 19:11:38 +02:00