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

6438 Commits

Author SHA1 Message Date
Remie Richards 438e45b5fc Drones are now picked up instantly, Drones escaping form someone's hands takes 5 seconds. 2014-10-09 21:30:15 +01:00
hornygranny 30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
paprka 149c9a3a76 big update 2014-10-08 20:58:43 -07:00
Francis Devine 5595d57f57 Add the click cooldown define to the last special defines 
This will stop these getting out of sync and let you change
all times with a single define
 2014-10-09 14:52:47 +13:00
Francis Devine f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
Francis Devine 970c61844f Cleaning up unecessary cooldown changes 2014-10-09 14:49:28 +13:00
hornygranny 02d8cf4115 Merge pull request #4994 from paprka/miningainteasy 
Mining rebalancing
 2014-10-08 14:44:35 -07:00
Remie Richards e60dda5f0e Merge pull request #5106 from paprka/megacarps 
Ports megacarps!!!
 2014-10-08 22:16:22 +01:00
paprka d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka 67dd029fe0 updated sprites, grey stuff 2014-10-08 10:38:24 -07:00
paprka b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07:00
paprka 18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2 
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
 2014-10-08 09:48:49 -07:00
paprka 668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-08 07:17:42 -07:00
paprka 8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Lo6a4evskiy 98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
 2014-10-08 16:45:22 +04:00
Remie Richards 7892359207 Merge pull request #5114 from hornygranny/fatstacks 
can no longer stack resin structures
 2014-10-08 10:21:49 +01:00
phil235 c607638f27 WIP 2014-10-08 01:24:49 +02:00
Cheridan f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Cheridan 0d0ae75102 Merge pull request #5108 from paprka/fixrobogrammar 
Fixes grammar in robot.dm
 2014-10-07 09:14:41 -05:00
Lo6a4evskiy 01ae516481 Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
 2014-10-07 12:38:47 +04:00
paprka 0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00
Cheridan 66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
 2014-10-06 19:27:14 -05:00
Hornygranny 265069f2a7 did it properly 2014-10-06 11:07:07 -07:00
Hornygranny 185048bfd5 can no longer stack resin structures 2014-10-06 10:55:20 -07:00
Lo6a4evskiy 61937c8dae Changed strip delays for most clothes 2014-10-06 19:42:12 +04:00
Remie Richards 5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man 
Updates spiders to have full player functionality
 2014-10-06 14:24:39 +01:00
Remie Richards acf5bee200 Merge pull request #5092 from Cheridan/flashing 
Flash Changes
 2014-10-06 14:10:31 +01:00
paprka ed3385dbf3 pro-LGBT grammar 2014-10-06 02:54:12 -07:00
paprka 2f960c8d89 lol 2014-10-05 22:25:53 -07:00
Cheridan f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor 
Change examine() from an atom verb to a mob verb
 2014-10-05 23:37:34 -05:00
paprka b9a10b5a82 removes qdel on death 2014-10-05 17:49:15 -07:00
Cheridan df8dc6d119 Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing 2014-10-05 19:24:49 -05:00
paprka f406371704 ports megacarps!!! 2014-10-05 16:19:19 -07:00
Lo6a4evskiy 10a3f27ffd Melee armor value increases time it takes to strip 2014-10-05 20:54:46 +04:00
Remie Richards 54a3e92145 Eyeball migration 2014-10-05 13:58:08 +01:00
phil235 dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00
Cheridan 2a12b149e1 Merge pull request #4966 from JJRcop/whisper-dead-dead 
Fixes being able to whisper while dead
 2014-10-05 00:40:28 -05:00
Cheridan e8a56ee14b Merge pull request #4949 from hornygranny/alienpockets 
alien pockets removed
 2014-10-04 23:53:06 -05:00
Cheridan 91cd4b2476 Final tweaks, map update. replaces cyborg's flash with their own subtype with the special effect. 2014-10-04 22:01:51 -05:00
Cheridan 08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235 537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
Cheridan 5c5fee201b Merge pull request #5060 from Perakp/simpleEmoteFix 
Fixes simple animal emote runtimes.
 2014-10-04 13:51:08 -05:00
Miauw 85adc6379f fixes zombie meat being more spooky than intended. 2014-10-04 16:09:48 +02:00
Miauw 3048b553e9 Adds super spooky zombies to spice up spookoween. 2014-10-04 15:54:39 +02:00
MrPerson 651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Remie Richards cd53199398 Merge pull request #5004 from Menshin/malf_timer_fixes 
Malf timer polishing/fixes
 2014-10-03 21:41:15 +01:00
Cheridan 9b7856e048 Merge pull request #5005 from Miauw62/wjfondlesxenos 
Makes xe- ALIENS hiss again when speaking.
 2014-10-02 22:01:18 -05:00
Perakp 83576edc4a - Fixes simple animal emotes from runtiming. 
- Fixes punctuation autism.!.!
 2014-10-02 23:03:41 +03:00
Incoming 8e99152226 Updates spiders to have full player functionality 
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)

I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
 2014-10-01 18:58:07 -04:00
Cheridan 088a2a2106 Merge pull request #5008 from Miauw62/EVERYTHINGBKEARPESK 
Simple animal emotes work again.
 2014-10-01 10:45:53 -05:00