coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,438 Commits 9 Branches 11 Tags
047de23ee0f97bf59ecc0a8564ed622f835948db
Commit Graph

12461 Commits

Author SHA1 Message Date
Xhuis 047de23ee0 Reverts chef description and fixes radiation suit label. 2014-11-21 10:59:15 -05:00
Xhuis 9d889797f5 Fixes collectable hat capitalization and changes the descriptions on some items. 2014-11-21 10:24:12 -05:00
Xhuis 2eb28a2a80 Fixes spelling errors in clothing item descriptions and adds/edits descriptions for others. 2014-11-20 23:26:10 -05:00
hornygranny a2785aaaa8 Merge pull request #5949 from tkdrg/borgalarm 
Lets borgs interact with air alarm wire panels
 2014-11-20 11:21:37 -08:00
hornygranny b2fba4a48f Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts 
Fixes select job equipment cancel
 2014-11-20 11:21:13 -08:00
Cheridan a1efd6cfde Merge pull request #5946 from tkdrg/tktp 
Fixes TK teleporting pictures and growns
 2014-11-20 13:05:11 -06:00
tkdrg edf92311cf Lets borgs interact with air alarm wire panels. 2014-11-20 13:41:56 -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
Cheridan 283cd657fe Merge pull request #5955 from Jordie0608/ideletedmyvdibyaccident 
Fixes #5951 Uplink implant TC amount description
 2014-11-20 08:55:15 -06:00
Cheridan 3c1b446a20 Merge pull request #5916 from Perakp/infiniteAbsorbFix 
Little absorb bugfixes
 2014-11-20 08:43:19 -06:00
Cheridan 8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS 
HoS Beret + Warden Drill Hat
 2014-11-19 10:26:27 -06:00
Jordie 48b60c82a1 Corrects uplink implant desc tc amount 2014-11-19 19:46:06 +11: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
Cheridan c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -06:00
tkdrg 0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608 ce6a1d0d89 Fixes select job equipment cancel 2014-11-18 22:50:33 +11:00
Razharas 87fe5489a7 Merge pull request #5701 from tkdrg/outoftheleftfield 
Containment fiels bounce structure, machinery & mechs, take two
 2014-11-18 04:39:48 +03:00
Razharas 59aa177af7 Merge pull request #5681 from Menshin/singulo_beacon_fix 
Singularity beacon fix and clean-up
 2014-11-18 04:19:00 +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
Menshin 1236f822d6 Conflict solving 2014-11-17 22:38:22 +01:00
Cheridan 5e68e30389 Merge pull request #5874 from phil235/MMIMechaFix 
Drones and silicons can no longer enter mechas.
 2014-11-17 14:00:09 -06:00
hornygranny 639594c7f9 Merge pull request #5890 from Jordie0608/iwhoopsedalloverit 
Fixes #5840 Improves stun baton messages
 2014-11-17 11:46:06 -08:00
hornygranny 1111c9caa7 Merge pull request #5915 from tkdrg/hugs 
Fixes a couple facehugger bugs
 2014-11-17 11:38:57 -08:00
Cheridan 53d913bc7f Merge pull request #5924 from tkdrg/junk 
Removes unticked unused code from the tree
 2014-11-17 13:34:49 -06: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
Remie Richards 2138e1d2c7 Merge pull request #5884 from tkdrg/ionblastUSA 
Moves the ion law picklists to an external txt
 2014-11-17 09:48:04 +00:00
Remie Richards 82d1af3ed9 Merge pull request #5888 from Menshin/supply_comp_href_fix 
Cargo shuttle href exploit fixed + orderable syndi crates
 2014-11-17 09:43:02 +00:00
paprka f69f81c8c2 fixes fuel tank crate 2014-11-16 12:34:11 -08:00
tkdrg 608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Razharas 6fba9b3a19 Merge pull request #5688 from Jordie0608/isitpronouncedlockorloch 
Fixes #5613 null acid loc
 2014-11-16 20:22:08 +03:00
Steelpoint 03a98a6295 HoSBeret 2014-11-16 22:32:01 +08: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
Perakp 8ac40af6ef - Fixes being able to absorb same target multiple times by spam clicking the absorb button 
- Fixes being able to absorb husks
 2014-11-16 12:01:57 +02:00
tkdrg e05dbe3b27 Fixes facehuger bugs 2014-11-16 03:26:27 -03:00
hornygranny 509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08:00
hornygranny ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08:00
Incoming 4a4b39b57f fixes the spider pathing 2014-11-15 14:55:48 -05: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 24c0c3d941 Merge pull request #5889 from Aranclanos/phazonchassis 
Fixes phazon chassis availability in the mech fabricator
 2014-11-15 20:39:36 +03:00
hornygranny 7d8b12bd43 Merge pull request #5896 from Menshin/nagging_debug_message 
Removed nagging debug message
 2014-11-14 17:19:15 -08:00
Menshin a926e68e31 Removed nagging debug message. 2014-11-15 02:17:22 +01:00
tkdrg 70f4cd24ef Floor refactor MkII: Fixes a few potential bugs 2014-11-14 21:36:45 -03:00
Razharas 2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx 
Moving carbon/middleclickon() form carbon.dm to click.dm
 2014-11-15 02:51:24 +03:00
paprka 2ab5701b97 Merge branch 'lolnames' of https://github.com/paprka/-tg-station into lolnames 2014-11-14 14:09:44 -08:00
paprka 03e07d5a56 Missed capitalization in a vendor name 2014-11-14 14:09:17 -08: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
Cheridan 8202db4227 Merge pull request #5755 from Miauw62/bughl 
Fixes grinders opening their menus on range.
 2014-11-14 14:50:46 -06:00
Razharas a4d0cfeba5 Merge pull request #5880 from phil235/FlashbangRuntimeFix 
Fixes the flashbang runtime.
 2014-11-14 22:38:00 +03:00
hornygranny b6d0531c34 Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge 
Fixes a glass table related exploit
 2014-11-14 10:54:39 -08:00
hornygranny 5b46822171 Merge pull request #5876 from phil235/ContagiousAppendicitisFix 
Fixes appendicitis being contagious.
 2014-11-14 10:54:10 -08:00