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

13853 Commits

Author SHA1 Message Date
Razharas 5e736281a7 Merge pull request #12871 from YotaXP/origin_tech_fix 
Fixed bad `origin_tech` values.
 2015-11-07 06:06:48 +03:00
Razharas 0066670421 Merge pull request #12872 from Anonus/gtfoghost 
Revenant Changes XVIII: You'd better be afraid of the ghost
 2015-11-07 04:27:52 +03:00
Razharas 8e2abcb378 Merge pull request #12700 from lordpidey/lordpidey_inject 
Adds new reagent application method, INJECT.  This will hopefully pre…
 2015-11-07 04:06:34 +03:00
Remie Richards a043e9b474 Items can now react to being constructed by autolathes 2015-11-06 17:32:48 +00:00
KorPhaeron f332f595a2 zip ties 2015-11-05 18:03:12 -06:00
Nerd Lord 0f23809346 Revenant changes XVIII 
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
 2015-11-05 18:50:51 -05:00
YotaXP 2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
phil235 2399ecc455 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChemistryManual 
Conflicts:
	icons/obj/library.dmi
 2015-11-05 17:03:24 +01:00
Cheridan 6555156399 Merge pull request #12812 from KorPhaeron/lasertag 
Makes lasertag projectiles beams
 2015-11-05 08:15:58 -06:00
Razharas 037b646f89 Merge pull request #12811 from Cuboos/A_Whole_new_bang 
New Flash bang sounds (OW FUCK MY EARS edition)
 2015-11-05 05:01:26 +03:00
Razharas 4c396657a2 Merge pull request #12818 from Shadowlight213/runtimefixes 
Fixes some runtimes
 2015-11-04 23:41:25 +03:00
Razharas 0a99df38ed Merge pull request #12295 from AnturK/weregoats 
Shapeshift Spell
 2015-11-04 17:10:27 +03:00
AnturK d77ad7a6f5 Fixes advanced camera resets. 2015-11-04 15:08:17 +01:00
AnturK d977085883 Proper category for shapeshift 2015-11-04 12:54:24 +01:00
KorPhaeron 46da6c62c5 Preferences 2015-11-04 02:28:31 -06:00
Cheridan fb3bbbee9c Merge pull request #12825 from xxalpha/resist 
Fixed cyborgs not being able to unbuckle with alarm button
 2015-11-03 23:05:59 -06:00
Incoming5643 555c37625b Adds force and armour_penetriation to the supermatter sword 2015-11-03 02:47:26 -05:00
Shadowlight213 71f9bbbfe5 Fixes to fixes 2015-11-02 21:26:46 -08:00
MMMiracles 906f49b089 lowers stun time of dihydrogen monoxide, still fatal if slipped on too many times 2015-11-03 00:03:41 -05:00
Razharas cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix 
Alt+click checks fix
 2015-11-03 04:19:38 +03:00
Cheridan ea42f2d43f Merge pull request #12780 from AnturK/nukekitfix 
Fixes one nuke kit per round.
 2015-11-02 19:15:59 -06:00
xxalpha c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00:00
Remie Richards 15bf91049e Improves Beam() code, Adds a new spacevine mutation+mob 2015-11-02 11:35:22 +00:00
Shadowlight213 2805d4becb Fixes runtimes in Dna console, message monitor, and igniter 2015-11-01 23:19:23 -08:00
Remie Richards 4754ffd770 Merge pull request #12788 from Incoming5643/80_win_rate 
Unbreaks Rev
 2015-11-02 05:05:08 +00:00
Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts 
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
 2015-11-02 01:06:30 -03:00
KorPhaeron 015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
Cuboos f136955d80 Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked) 2015-11-01 18:51:00 -08:00
AnturK 150c25b810 Shapeshift Spell 2015-11-02 00:28:58 +01:00
KorPhaeron 47d1d57a69 Removes spam 2015-11-01 17:04:49 -06:00
Razharas 3cd68567ab Merge pull request #12754 from KorPhaeron/headsets 
Adds normal captains headset to captains locker
 2015-11-02 01:35:25 +03:00
Remie Richards 046948f314 Merge pull request #12630 from KorPhaeron/Reflector 
Laser Reflector Structure
 2015-11-01 21:46:29 +00:00
KorPhaeron 99cc8aca9a Proper istype 2015-11-01 15:36:28 -06:00
Xhuis e291a05692 Adds the admin_override variable to Veil 2015-11-01 13:05:26 -05:00
xxalpha 9f4db8078b Made it possible to paint windows to make them opaque. 
Not tinted windows

Changed how painting and opacity work.

Clean timer
 2015-11-01 16:26:54 +00:00
Razharas f618a4690b Merge pull request #12752 from KorPhaeron/xenobiology2 
Xenobiology Control Console
 2015-11-01 18:30:34 +03:00
KorPhaeron f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00
Razharas 8b22368202 Merge pull request #12678 from MMMiracles/asmartidea 
Esword Embedding
 2015-11-01 16:17:01 +03:00
Razharas 5ba4e04027 Merge pull request #12646 from Shadowlight213/OOCban 
Adds the ability to ban someone from OOC
 2015-11-01 15:43:55 +03:00
Razharas 8fc114e837 Merge pull request #12645 from Incoming5643/supermatter_sword 
SUPERMATTER SWORD!
 2015-11-01 15:43:06 +03:00
KorPhaeron d26f642daf Jobbans 2015-11-01 03:36:01 -06:00
kingofkosmos e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
Incoming d08dc9a03d Dark . wizardry and general clean up of years old code 2015-11-01 02:53:51 -05:00
KorPhaeron f45b34e73b Cleaner code 2015-11-01 01:39:33 -06:00
PKPenguin321 63322f411b fixes the logic 
thanks xxalpha
i'd describe the change more in-depth but it's literally one line, hopefully you can figure out what i changed
 2015-10-31 22:57:26 -07:00
Xhuis 3c20526900 Re-adds dethralling surgery and speeds up enthralling 2015-11-01 01:39:01 -04:00
Incoming 993052c9db I've made a terrible mistake 2015-11-01 00:46:52 -04:00
Cheridan 3e3aa2ee9f Merge pull request #12748 from MrStonedOne/sweetsweetdimlight 
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
 2015-10-31 22:22:39 -05:00
KorPhaeron 5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
Incoming 74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi
 2015-10-31 19:56:13 -04:00