coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,694 Commits 9 Branches 11 Tags
93077ab2e356edf025191dfec6ecd91c9eea85a5
Commit Graph

4895 Commits

Author SHA1 Message Date
Razharas c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco 
Small changes to mobs on fire
 2015-09-02 14:38:20 +03:00
Ergovisavi bf69c85f71 Mobs on fire adjustments: 
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
 2015-09-01 22:04:10 -07:00
Razharas 93ca749785 Merge pull request #11478 from xxalpha/crawlinginmyskin 
Changed blood crawl to be a spell.
 2015-09-01 18:36:20 +03:00
Aranclanos 87971f36c9 Merge pull request #11484 from spasticVerbalizer/swarmEmptyMessage 
Adds check for empty message in guardian communicate verbs
 2015-09-01 12:27:26 -03:00
Razharas 737ee58330 Merge pull request #10830 from xxalpha/HACKERS 
Made it possible to emag a cyborg more than once.
 2015-09-01 17:58:53 +03:00
xxalpha a5062c812b Added emag cooldown. Added emag protection if cyborg slaved to tator AI. 2015-09-01 15:53:12 +01:00
xxalpha 75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin 
Conflicts:
	icons/mob/actions.dmi
 2015-09-01 15:39:15 +01:00
Razharas 72610973cc Merge pull request #11427 from xxalpha/magborg 
Gave engineering cyborgs permanent magboots effect.
 2015-09-01 17:31:15 +03:00
xxalpha 642406e6c9 Merge remote-tracking branch 'upstream/master' into HACKERS 2015-09-01 14:05:35 +01:00
Razharas a1e74cb22d Merge pull request #11334 from oisin100/patch-2 
Realistic Trees
 2015-09-01 16:00:13 +03:00
Razharas 37556b1c1f Merge pull request #11491 from Aranclanos/ghostyelling 
Fixes ghost yelling, now the message will be displayed.
 2015-09-01 15:56:29 +03:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
Razharas 829a88816b Merge pull request #11179 from Dorsisdwarf/andtheyrelikeitsdeaderthanyours 
Makes lings undetectable to the AI when using digital camo
 2015-09-01 11:00:38 +03:00
Razharas 446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor 
Cyborgs unlocking cover and AI unanchoring upon dying.
 2015-09-01 10:08:08 +03:00
Razharas cddb32f606 Merge pull request #11384 from Aranclanos/petemilking 
Fixes goat and cow milking, they were just simply not working.
 2015-09-01 10:02:27 +03:00
duncathan 48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE 
Conflicts:
	code/game/objects/effects/landmarks.dm
 2015-09-01 00:11:33 -06:00
xxalpha 4644e99aa7 Changed bloodcrawl to be a spell. 
Changed blood crawl to be a spell.

BLOOOOD
 2015-08-31 16:24:27 +01:00
xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-08-31 08:52:30 +01:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan 69fa21e66d Merge pull request #11472 from Aranclanos/larvatypo 
REMOVES ALIEN LARVAS
 2015-08-31 00:30:31 -05:00
Aranclanos d3b131a2ad Fixes ghost yelling, now the message will be displayed. 
Same with binary chat, blob overmind and alien hivermind.
 2015-08-30 19:14:30 -03:00
Razharas d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL 
Added qdel(wires) to a bunch of objects Destroy proc.
 2015-08-31 00:08:27 +03:00
Maarten van den Berg 2a933dd0b3 Adds check for empty message in guardian communicate verbs 2015-08-30 16:28:35 +02:00
Jordie f26a67348d Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner 
Some swarmer issue fixes
 2015-08-30 17:51:57 +10:00
Aranclanos 0da6bf9430 Merge branch 'master' of https://github.com/tgstation/-tg-station into petemilking 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
 2015-08-29 23:14:57 -03:00
Aranclanos 537c823fa8 Removes an incorrect type path, mob/living/carbon/larva, unused. It was just a typo. 2015-08-29 22:48:20 -03:00
Cheridan 04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents 
Fixes alien larva breathing.
 2015-08-29 20:02:29 -05:00
Cheridan 7a469e240a Merge pull request #11437 from bgobandit/dronepax 
Refactors medical stacks used on simple animals.
 2015-08-29 18:55:27 -05:00
Ergovisavi 49ce1d65db -Fixes #11448 
-Fixes #11443
Swarmer related issues
Also adds feedback to where unactivated swarmers spawn, and if someone took one before you
Fixes the automated announcement system not qdel()-ing properly
 2015-08-29 14:45:28 -07:00
hornygranny 2367ae48c9 Revert "Smooth out gliding so movement isn't (as) jerky" 2015-08-29 13:37:55 -07:00
xxalpha 3379cb8145 Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly. 2015-08-29 19:24:36 +01:00
Cheridan a904c2a765 Merge pull request #11446 from AnturK/randomfixes 
Armor Fix, Restrained SNPC fix
 2015-08-29 13:13:49 -05:00
Swag McYolosteinen 137f0e0baf Merge pull request #11159 from MrPerson/smooth_gliding 
Smooth out gliding so movement isn't (as) jerky
 2015-08-29 17:56:40 +02:00
Aranclanos 3714bdf0d2 Fixes alien larva breathing. 
Moves the create_reagets() to carbon New() instead of each subtype calling it by themselves.
 2015-08-28 18:21:28 -03:00
AnturK 0e46800fd1 fixes snpc cuff pulling 2015-08-28 19:03:22 +02:00
bgobandit 607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax 
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
 2015-08-28 02:54:43 -04:00
bgobandit 6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
Cheridan d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm 
Adds "Swarmers" - Simple mob side antagonist
 2015-08-28 00:21:23 -05:00
Ergovisavi 3737234b9c -Adds swarmer as a language, makes them only able to speak to each other 
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
 2015-08-27 22:10:30 -07:00
xxalpha f8f5f689d9 Gave engineering cyborgs permanent magboots effect. 2015-08-27 20:23:35 +01:00
xxalpha 19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc. 
Return ..()
 2015-08-27 11:10:58 +01:00
Aranclanos 9c9bf4a858 Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far 
Fixes infinite wumbo-ing
 2015-08-27 01:06:03 -03:00
Cheridan 3278a3926b Merge pull request #11358 from phil235/XenoFeatures1 
Facehugger inhands, xeno tweaks, and monkey bugfixes
 2015-08-26 07:52:31 -05:00
Oisin100 cc45babcc7 Removed Comment 2015-08-26 11:38:53 +02:00
Aranclanos 38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt 
Removes dirt from walking on tiles
 2015-08-26 06:27:31 -03:00
Ergovisavi 6277a80cdb -Fixes infinite wumbo-ing 2015-08-25 14:02:48 -07:00
phil235 67a7eb2d5f Merge pull request #11277 from Jordie0608/beforecolortvalllistswereblackandwhite 
Changes gold slime core hostile mob list to var
 2015-08-25 20:03:13 +02:00
Ergovisavi 9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc 
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
 2015-08-25 03:24:34 -07:00
Aranclanos 8a7c65817d Fixes goat and cow milking, they were just simply not working. 2015-08-25 04:24:59 -03:00
Oisin100 da2e11fd92 Update tree.dm 2015-08-25 00:22:16 +02:00