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

7166 Commits

Author SHA1 Message Date
Jordie0608 ec9382c43b Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
 2015-05-13 20:01:27 +10:00
Jordie 01ad517894 Merge pull request #9457 from Cheridan/hoes 
KEEP YOUR HOES IN LINE
 2015-05-13 19:50:18 +10:00
Jordie a978ee6ba3 Merge pull request #9458 from xxalpha/cyborgtiles 
Fixed cyborg floor tiles being infinite.
 2015-05-13 19:45:45 +10:00
Jordie f36d76167c Merge pull request #9444 from Xhuis/cannonBuildFix 
Fixes the pneumatic cannon recipe not working
 2015-05-13 19:45:00 +10:00
Jordie d5be3018c1 Merge pull request #9353 from Firecage/Pickupverb 
Allows you to pick up stuff with the verb while buckled.
 2015-05-13 19:41:53 +10:00
xxalpha ab16875492 Fixed dualhanded runtime. 2015-05-12 23:55:49 +01:00
xxalpha 0220817b0c Fix lighter/dropped runtime that happened once. 
That was no fix. It doesn't need fixing.
 2015-05-12 23:45:22 +01:00
spasticVerbalizer 1468ad5b6f Heat-proofness now determined by the type of glass in the airlock 2015-05-12 11:33:21 +02:00
xxalpha e5dfaaf007 Fixed cyborg floor tiles being infinite. 2015-05-11 22:08:16 +01:00
Cheridan f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Xhuis 330a24e4f1 Removes unnecessary comma 2015-05-11 16:32:41 -04:00
spasticVerbalizer 1cc928fac3 Makes the plasteel sheet drop when the assembly is disassembled without removing the sheet, grammars a comment 2015-05-11 21:12:18 +02:00
spasticVerbalizer bccb7cb14f Standardized heat-proofing airlocks 2015-05-11 20:52:31 +02:00
Fayrik 0ba314552a The initial tweaks are in place, ran out of time to finish it though. 2015-05-11 18:54:31 +01:00
Jordie0608 7357a10f68 more fixes 2015-05-11 20:27:16 +10:00
Xhuis b8734211d0 Fixes the pneumatic cannon recipe 2015-05-10 12:28:42 -04:00
Jordie bd12598404 Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls 
Adds check to prevent false wall stacking, fixes #6449
 2015-05-11 00:07:11 +10:00
spasticVerbalizer 040fd7d8b7 Change uses of 'usr' to 'user', move checking of wall up so the message actually shows 2015-05-10 13:31:10 +02:00
Jordie0608 f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00
Remie Richards 7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes 
Merges power subsystem into machine subsystem.
 2015-05-10 08:23:20 +01:00
MrStonedOne c6c7237265 Merges power subsystem into machine subsystem. 
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
 2015-05-09 23:48:18 -07:00
Jordie0608 332419ca31 adds target to do_after 2015-05-10 15:44:54 +10:00
Jordie0608 502d21a4da Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine 
Conflicts:
	tgstation.dme
 2015-05-10 14:48:35 +10:00
spasticVerbalizer 087365e763 src.contents to src.loc.contents 2015-05-09 20:49:44 +02:00
phil235 72169da31f Merge pull request #9409 from GunHog/The_Machine_Spirit_Sings_To_Me 
Removes mining drill power mechanic.
 2015-05-09 19:38:17 +02:00
Cheridan 36be3b6983 Merge pull request #9110 from Xhuis/double_cannons 
Adds the Pneumatic Cannon
 2015-05-09 12:00:45 -05:00
spasticVerbalizer faf6bff92c Typecheck for turf being a wall, look in contents rather than loc. 2015-05-09 18:58:30 +02:00
GunHog 7c9667db38 Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me 2015-05-09 11:40:44 -05:00
Cheridan 4e787fb980 Merge pull request #9358 from Firecage/Weldersprites 
New welder sprites and welder name, Fix experimental welder.
 2015-05-09 11:26:32 -05:00
phil235 1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere 
Group of fixes
 2015-05-09 16:23:46 +02:00
Jordie0608 7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie 9387af3587 Merge pull request #9403 from francinum/patch-1 
Span Closure
 2015-05-09 22:12:04 +10:00
Jordie 67fe7dc25c Merge pull request #9396 from Firecage/Nodropmutants 
Prevents golems and skeletons from dropping due to shards and mousetraps
 2015-05-09 22:05:04 +10:00
Jordie aafa80dcd8 Merge pull request #9378 from GunHog/diamond_tipped_spirals 
Fixes the mining borg diamond drill upgrade
 2015-05-09 21:45:21 +10:00
Jordie 54bcdb1b78 Merge pull request #9354 from Firecage/NoAIBuckling 
Prevents an AI from being buckled.
 2015-05-09 21:35:52 +10:00
Jordie 4e82cd9689 Merge pull request #9355 from Firecage/OverlaycleanBGone 
Removes the ability to clean Overlays
 2015-05-09 21:30:21 +10:00
Jordie 45b76d4a26 Merge pull request #9337 from xxalpha/ash 
Fixed a couple of small problems with smoking pipes.
 2015-05-09 20:33:00 +10:00
Jordie 279a2653c6 Merge pull request #9347 from SamuelRowe/master 
Spelling and grammar fixes *FIXED*
 2015-05-09 20:31:54 +10:00
Remie Richards fdeb84021d Merge pull request #9320 from GunHog/Botcall_V2 
Bot performance and PDA features update
 2015-05-09 06:26:19 +01:00
Remie Richards 3b98e4448d Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions. 2015-05-09 01:02:06 +01:00
Cheridan f0003cd7d4 Merge pull request #9385 from optimumtact/forkingfantastic 
Fork eating no longer requires mouth zone sel
 2015-05-08 15:51:43 -05:00
GunHog 26df5b6c8e Removes mining drill power mechanic. 
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
 2015-05-08 10:12:22 -05:00
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot 
Fixes #9035, atmos locker sprite and misc logging bug
 2015-05-08 16:24:21 +02:00
Jordie e71106ad13 Merge pull request #9289 from Xhuis/now_he's_poorly_from_too_much_electric 
Adds a second functionality to the emagged defibrillator
 2015-05-08 22:10:49 +10:00
Jordie c9b804f6f6 Merge pull request #9256 from astralenigma/cradesbypaprka 
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
 2015-05-08 22:10:35 +10:00
francinum 939ceae37d Closes the <span> tag 2015-05-07 21:26:31 -04:00
Firecage 41b1b7dee8 Adds a check to prevent a future ranged message + fixed the message 2015-05-07 23:55:26 +02:00
Firecage 3e540dafdc Adds D4 to the HARDFEET mix. 2015-05-07 18:43:50 +02:00
Ikarrus 4892281057 Sanitized inputs, admin notices, and changelog 2015-05-07 08:46:38 -06:00
Firecage 1fb8dcecd1 Prevents golems and skeletons from dropping due to shards and mousetraps 2015-05-07 15:44:17 +02:00