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

4458 Commits

Author SHA1 Message Date
fleure c0798bc67a Whoops debug message :3c 2014-11-24 21:15:34 +00:00
fleure 918d47cc84 Made RCD have concurrent builds again 2014-11-24 21:11:19 +00:00
phil235 fd1abc6436 Fixes laterballons icon update problem and the infinite burst issue. Blowing it now requires to attack the balloon with a tank not the other way around. Adding a message when you blow up the latexballoon. You can burst the balloon with a hot weapon like a lit lighter (is_hot() items) 2014-11-24 19:35:14 +01:00
phil235 b5cfe103a9 You can now light someone's cigarette in his mouth with a lit match (just like with lighters or lit cigarettes) 2014-11-24 18:12:32 +01:00
paprka 99d364220f code tidying 2014-11-24 06:21:44 -08:00
paprka 6d86949742 removes flashbang protection from hats, gives it to bowman headsets 2014-11-24 05:55:13 -08:00
Razharas 84e69cff6b Conflict resolve 
Damn cables
 2014-11-24 12:27:53 +03:00
paprka b6629bc636 fixes head of security and warden hats not having flashbang protection 2014-11-23 20:37:55 -08:00
phil235 86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker). 
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
 2014-11-24 01:49:34 +01:00
Jordie0608 58df027021 Makes dice use overlays 2014-11-24 08:01:32 +11:00
Razharas 717fb78278 Merge pull request #5994 from phil235/RadLaserAnimFix 
Traitor health analyzer stops doing attack animation and hitsound
 2014-11-23 23:41:46 +03:00
tkdrg 35cbf8918e Adds new undershirts, jeans and pants by WalterJe 
Adds the undershirts by JStheguy

Ports some pants by JStheguy from NTstation

Ports the clothes vending machine from NTstation

Adds the clothesmate restock icon by WJohnston
 2014-11-23 13:58:32 -03:00
fleure e8ca9ec224 Fixes multiple airlocks on same tile 2014-11-23 16:32:24 +00:00
Razharas 3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
 2014-11-23 17:46:14 +03:00
tkdrg 063a19c814 Fixes wizard slipping on all the area soaps 2014-11-22 19:24:57 -03:00
Swag McYolosteinen 002ecddba3 Merge pull request #5849 from phil235/SoapMsgFix 
Fixes the mouth washing message
 2014-11-22 19:08:55 +01:00
phil235 0bc84e120e Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix 
Conflicts:
	icons/mob/items_lefthand.dmi

Adding PR 5829 to my PR so both can be merged now.
 2014-11-22 18:56:31 +01:00
tkdrg 2b5c67fb36 Fixes blueprint HTML injection exploit 2014-11-22 14:32:10 -03:00
phil235 d6c2cb4df5 Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff. 2014-11-22 17:36:02 +01:00
hornygranny dce9dadea2 Merge pull request #5914 from paprka/removewindows 
Changes most border windows/firelocks to full tile
Gets paprika killed
 2014-11-21 11:47:04 -08:00
Cheridan 7feaa1cf66 Merge pull request #5934 from paprka/defibbuff 
Buffs defibrillator PNR to 5 minutes
 2014-11-21 10:30:38 -06:00
Cheridan 448d0fab7f Merge pull request #5913 from tkdrg/yearslater 
Makes cyborg modules NODROP
 2014-11-21 10:17:53 -06:00
Cheridan a9199118e5 Merge pull request #5925 from paprka/flashfix 
Fixes flashes being useless
 2014-11-21 10:14:39 -06:00
paprka 41c86dd557 fixes disarming affecting area stuns 2014-11-21 08:06:07 -08:00
Hornygranny 678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
tkdrg e03c5129da Makes storage items update properly on insertion 
Previously, it would only update the storage view for usr, so it would
look wrong to any other players which are interacting with the same
storage item at the same time.
 2014-11-20 14:00:17 -03:00
Cheridan 0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76 
Magic Mania 1.76: Lets outrun the feature freeze
 2014-11-20 09:07:41 -06:00
Razharas afac70c4f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-19 21:37:06 +03:00
Razharas ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
Cheridan 1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix 
Atmos z level fix + radio controller code sanitization
 2014-11-18 17:05:14 -06:00
Razharas b7d08c591e Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-18 16:23:04 +03:00
Razharas b071a0167e Made explosions work in a slightly different way 
Yep
 2014-11-18 16:22:41 +03:00
Razharas e205c8f2f6 Merge pull request #5857 from paprka/lolnames 
Fixes a bunch of capitalization inconsistencies, adds names to vendors
 2014-11-18 03:46:26 +03:00
hornygranny 639594c7f9 Merge pull request #5890 from Jordie0608/iwhoopsedalloverit 
Fixes #5840 Improves stun baton messages
 2014-11-17 11:46:06 -08:00
Remie Richards 85f735c504 Merge pull request #5878 from phil235/DroneShardFix 
Fixes drones cutting their hands when using shards.
 2014-11-17 09:55:19 +00:00
paprka 12ec40d246 buffs defibrillator PNR to 5 minutes 2014-11-16 21:22:05 -08:00
paprka fd910387c3 windows damage and such 2014-11-16 17:13:33 -08:00
tkdrg fd0387c151 Fixes chem grenade phasing through windows/windoors. Changes chem grenade reactions to be slightly more realistic, volume-wise. 2014-11-16 21:23:56 -03:00
paprka 649be7cf8a Fixes flashes being useless 2014-11-16 14:39:50 -08:00
tkdrg 0f28c013ff Makes cyborg modules NODROP 2014-11-16 15:59:57 -03:00
Razharas 4b0ab2d52a Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-16 13:59:50 +03:00
Razharas 3a9c5be027 Fix of c4 incorrect behaviour 
Yes yes its a bug there is issue with it and its called a bug and this a
a bug fix not a feature dont freeze
 2014-11-16 13:59:36 +03:00
Razharas 54299ac9b4 Merge pull request #5812 from fleure/nozfix 
Fixes nozzle deleting and adds some safety to nozzle toggling
 2014-11-16 13:44:42 +03:00
tkdrg 705a264dcf Makes data huds passive. 2014-11-16 01:52:06 -03:00
hornygranny ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08:00
Incoming fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Razharas 4f81da5bdf Merge pull request #5797 from Steelpoint/BeltFix 
Fix: SecBelts can hold Tear Gas Grenades
 2014-11-15 01:03:46 +03:00
Razharas a4d0cfeba5 Merge pull request #5880 from phil235/FlashbangRuntimeFix 
Fixes the flashbang runtime.
 2014-11-14 22:38:00 +03:00
Jordie0608 e771e8f91e improves stun messages 2014-11-15 05:48:47 +11:00
tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
 2014-11-14 15:23:35 -03:00