coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,654 Commits 9 Branches 11 Tags
a54fc8ef736dbf58fdb5faaa587bd0340bc5b966
Commit Graph

6332 Commits

Author SHA1 Message Date
hornygranny a54fc8ef73 Merge pull request #5410 from phil235/bookcarvingIconFix 
Books keep their original icon when carved.
 2014-10-22 14:41:57 -07:00
Hornygranny 72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity 
Conflicts:
	code/modules/mob/living/living.dm
 2014-10-22 13:26:35 -07:00
hornygranny 79c61500f1 Merge pull request #5399 from phil235/LaserGunFix 
Fixes the lasergun icon never being empty.
 2014-10-22 10:53:49 -07:00
hornygranny 16d299e5c5 Merge pull request #5379 from optimumtact/revertclick 
Revert my click cooldown changes
 2014-10-21 18:39:21 -07:00
phil235 1ed3d50db2 Fixes the book changing icon when carved. 2014-10-21 23:51:41 +02:00
Cheridan a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1 
closets can no longer contain a near infinite amount of mobs.
 2014-10-21 12:15:30 -05:00
hornygranny e556867a58 Merge pull request #5277 from paprka/newshotguns 
Adds improvised shotguns and fixes paths for wrap paper
 2014-10-21 09:51:35 -07:00
phil235 c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
phil235 56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
 2014-10-21 15:58:39 +02:00
phil235 ebabe9af3a Fixes the lasergun icon never being empty. 2014-10-21 15:36:18 +02:00
hornygranny 20329a3bdb Merge pull request #5240 from paprka/assantag 
Assistant antagonist config option
 2014-10-20 20:19:08 -07:00
hornygranny 1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix 
Fix for #4602
 2014-10-20 20:18:06 -07:00
hornygranny 8553f8765b Merge pull request #5280 from Jordie0608/increasingquizzicality 
Adds adminmoreinfo to Syndicate and Centcomm messages
 2014-10-20 20:05:22 -07:00
Cheridan d3b7bd5329 Merge pull request #5303 from hornygranny/howdoespolarbearknowwhatapplesis 
nonhumans can no longer write
 2014-10-20 22:05:01 -05:00
hornygranny 9c975b3018 Merge pull request #5372 from paprka/prisonjumpsuit 
Fixes prisoner jumpsuit adjusting
 2014-10-20 20:01:42 -07:00
paprka ea591b26dc Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonjumpsuit 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-20 19:48:27 -07:00
hornygranny 1bba60d17f Merge pull request #5346 from Incoming5643/clumpingmystyle 
Returns the missing grassclump icon
 2014-10-20 19:39:43 -07:00
hornygranny 514e5b78d7 Merge pull request #5369 from paprka/whizzard 
Adds yellow wizard robe
 2014-10-20 19:35:40 -07:00
hornygranny 45b2ed0d0e Merge pull request #5248 from Jordie0608/helpimbeingoppressedbycode 
Remove del-alls list of safes
 2014-10-20 19:34:29 -07:00
hornygranny afe171bb0a Merge pull request #5313 from TZK13/Preferences-Setup-Fixes 
Fixes the previews in the character setup screen
 2014-10-20 19:32:48 -07:00
hornygranny 9e2dc67e86 Merge pull request #5363 from Cheridan/better_noms 
Anomaly Event Changes
 2014-10-20 19:24:04 -07:00
hornygranny d74690a7bf Merge pull request #5308 from Menshin/radiation_decreasing_fix 
Fixes radiation levels getting stuck
 2014-10-20 19:20:19 -07:00
hornygranny 18c669a4fc Merge pull request #5364 from JJRcop/Reactivated-drones-still-in-dead-mob-list 
Fixes a bug with reactivated drones not being removed from the dead_mob_list
 2014-10-20 19:19:45 -07:00
hornygranny 6b108a6c6b Merge pull request #5367 from paprka/rollinfix 
Fixes jumpsuit rolling for random jumpsuits
 2014-10-20 19:17:56 -07:00
Hornygranny 3f095fb39f lol forgot to save all 2014-10-20 17:16:39 -07:00
Hornygranny 1713a089b4 src 2014-10-20 17:13:24 -07:00
Hornygranny 386972886b fixes 2014-10-20 16:55:02 -07:00
Hornygranny e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07:00
Remie Richards b7de714fa7 Merge pull request #5257 from Incoming5643/WhatAJobber 
Manage Free Slots
 2014-10-20 14:35:18 +01:00
Francis adf252df9b Keep the define around as that is a good idea 2014-10-20 22:49:06 +13:00
Francis 25d587a483 Revert "Cleaning up unecessary cooldown changes" 
This reverts commit 970c61844f.
 2014-10-20 22:22:51 +13:00
Francis b3de61552f Revert "Defines for the define god" 
This reverts commit f737f7889c.
 2014-10-20 22:22:38 +13:00
Francis c50c26a48f Revert "Add the click cooldown define to the last special defines" 
This reverts commit 5595d57f57.
 2014-10-20 22:22:23 +13:00
Cheridan c67052b58d Merge pull request #5200 from PatchouliKnowledge/Phazons 
Lots of mecha changes and additions.
 2014-10-20 01:27:50 -05:00
Cheridan 3fd1b8629c Merge pull request #5347 from RemieRichards/LabcoatSwitchFix 
Labcoat toggle() unfuck
 2014-10-20 01:04:09 -05:00
paprka d780614b95 allows sleeve rolling of tacticool jumpsuit 2014-10-19 20:53:35 -07:00
Cheridan 455b526cc1 Merge pull request #5318 from phil235/MsgFix2 
More messages fixed
 2014-10-19 21:39:06 -05:00
paprka 42e871a6ed added sawing off to all weapons 2014-10-19 17:49:05 -07:00
paprka 2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
 2014-10-19 17:30:47 -07:00
paprka 08ec41c393 Merge branch 'master' of https://github.com/tgstation/-tg-station into whizzard 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-10-19 17:20:20 -07:00
Cheridan c5ed446f24 Merge pull request #5300 from phil235/DroneArrestFix 
Fix for #5281
 2014-10-19 18:54:33 -05:00
paprka e1cfa3fed0 adds yellow wizard robe 2014-10-19 16:46:32 -07:00
paprka 497bb10e26 fixes jumpsuit rolling for random jumpsuits 2014-10-19 16:14:38 -07:00
Cheridan 4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher 
Fixes cyborgs being able to add their flashes to things
 2014-10-19 17:44:30 -05:00
JJRcop 86287072ec Fixes a bug when reactivating drones where they wouldn't be removed from the dead_mob_list 2014-10-19 18:15:18 -04:00
Cheridan f52d3e8c69 Anomaly Event Changes 
Increases the duration and occurrence rate of Anomaly events.
Anomaly cores now give better research values.
Bluespace anomalies no longer teleport anchored objects because it looks godawful.

If not defused, Pyroclastic Anomalies will create a red or orange slime.
 2014-10-19 17:07:07 -05:00
xxalpha d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
Remie Richards 7ae1a6f634 Replaces horrific switch() on labcoats in labcoat.dm, each labcoat HAND TESTED to ensure icons still work 2014-10-19 03:47:28 +01:00
paprka ebeba833e7 reverts wizard jumpsuit stuff 2014-10-18 19:31:56 -07:00
Incoming 1212180556 Returns the missing grassclump icon 
Introduces the improvements added to grass in #5253 to carpets
 2014-10-18 20:58:07 -04:00