coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,624 Commits 9 Branches 11 Tags
a2fb8bc3eba996ade2497a3fbafacf209b0763e9
Commit Graph

479 Commits

Author SHA1 Message Date
Razharas f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
Ergovisavi 05687e2490 Reduced the effectiveness of the resonator, resonator kit no longer has stimulant pills, lazarus mobs have attack_self 1 to not build an army of loyal mobs, as a wall of goliaths is too effective. Removed messaging admins for gibtontie deposits on the mining zlevel. Made the Superpacman generator a little more efficient. 2014-02-27 21:02:41 -08:00
Ergovisavi 83c85abe26 Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes 2014-02-25 17:38:24 -08:00
Ergovisavi a4ffdf1cb7 Asteroid/Mining tweaks: 
Adding mining GPS so miners can find each other more easily on the asteroid
Ore Redemption machine usability improved, also now only processes 10 ore per tick due to possible issues with mass processing of ores
Labor mineral rates edited to fall in line with the rest of the minerals, Labor stacker points increased to compensate
Treasure rooms should now spawn properly and start unlit, treasure items tweaked
Cargo points per plasma sheet significantly increased due to increased rarity
PACMAN generator made significantly more efficient to compensate for increased rarity of plasma, amount of plasma in engineering reduced as a result
Slight tweaks here and there of mining mobs in general
 2014-02-25 06:03:17 -08:00
Razharas 56f94f59da Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag 2014-02-25 05:05:22 +04:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path 
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
 2014-02-24 05:14:43 +04:00
AlexanderUlanH 1d6981c2d3 Remove name checks 2014-02-19 17:23:57 -05:00
fleure 8108cb1b7f Merge pull request #2811 from Ccomp5950/master 
Code effeciency project: apc icon_update()
 2014-02-19 19:09:05 +00:00
Miauw 3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP 
Conflicts:
	code/modules/mob/transform_procs.dm
 2014-02-18 18:22:40 +01:00
Ccomp5950 fdc0a26b00 Removed extra overlays length check. 
No reason to do that if we're doing it again 2 lines down.
 2014-02-17 19:07:53 -06:00
Aranclanos b78c7eca06 Merge pull request #2809 from hornygranny/throwspeed 
throwspeed pass
 2014-02-17 06:26:06 -02:00
Ccomp5950 91fbd0ef88 Code effeciency project: apc icon_update() 
caching the icon states instead of creating them each time
checking to see if any icon_state or overlay changes and only
applying the ones that do.
 2014-02-16 12:17:41 -06:00
Razharas 923f8fc565 Merge pull request #2800 from MrPerson/del_in_progress 
Only report emitter/SMES deletion if the round's in progress.
 2014-02-16 08:36:25 -08:00
fleure aead3ee208 Merge pull request #2770 from Aranclanos/singularitynomnom 
singularity spawn() runtimes
 2014-02-16 14:30:47 +00:00
Hornygranny 9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP 
Conflicts:
	code/modules/mob/mob.dm
 2014-02-15 17:30:21 +01:00
MrPerson c551018db2 Only report emitter/SMES deletion if the round's in progress. Should mean less log/message spam because of the emitter crate. 2014-02-15 00:18:10 -08:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Aranclanos 18d7081d33 removes a spawn() from the singularity consume proc that was causing runtimes. I think it also makes the singularity less laggy? Or maybe it's just a placebo effect. 2014-02-13 13:17:18 -03:00
Razharas 9d88f3f0bf Changed paths of the compressors 
Its power now
 2014-02-11 16:18:02 +04:00
Razharas 009fe9eb77 Actual turbine fix 
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
Please not to upstream Please not to upstream Please not to upstream
 2014-02-10 21:53:24 +04:00
Razharas 398b6f48da Turbine fix 
Never change byond, never change
 2014-02-10 20:21:03 +04:00
MrPerson c269999796 Way to leave those debug messages in, self 2014-02-08 10:53:55 -08:00
MrPerson 6488b34533 Merge branch 'master' of https://github.com/tgstation/-tg-station into NanoSMES 
Thanks Razharas, hehe
Merge new SMES vars and Nanou in with constructable SMES and whatnot
 2014-02-08 07:51:28 -08:00
Razharas 2666ba1e8b Fixes incorrect cables conflict issue 
They work again
 2014-02-07 07:07:31 +04:00
Razharas 2d125f0fc5 And more fixes 
The ride never ends
 2014-02-06 22:32:28 +04:00
Razharas a589387ccf Fixing merge conflicts 
THis is getting harder and harder
 2014-02-06 22:26:16 +04:00
MrPerson a5eb0b5bbe On second thought, allow turning input/output on and off on SMES no matter what. 
Also added a messages telling you specifically if the SMES is actually charging or outputting.

Also clean up some unnecessary shit.
 2014-02-05 23:49:04 -08:00
MrPerson c8144bc5c6 Nano UI for SMES 
Screenshot:
http://imgur.com/63D3f8b
Buttons are greyed because there's no input available.
 2014-02-05 16:32:07 -08:00
Razharas caea1d5108 Fixes cable coils 
So glad can code again, probably addicted to it
 2014-02-05 19:45:33 +04:00
MrPerson 931da9e7ef Many changes 
Much diff
 2014-02-04 22:49:38 -08:00
Cheridan ad235cf18f Merge pull request #2563 from Razharas/NewTables 
New PR for crafting tables
 2014-02-03 08:46:56 -08:00
Cheridan d7f6afc8d2 Merge pull request #2600 from Aranclanos/PAdel 
fixes issue #2238
 2014-02-02 22:34:41 -08:00
Cheridan b9f47fd412 Merge pull request #2573 from Giacom/MiniStation 
Updated the MiniStation map with some minor tweaks.
 2014-02-02 16:13:44 -08:00
Aranclanos 68fd365ae8 fixing the Del() of the control panel of the PA 2014-02-02 05:26:05 -03:00
Aranclanos 976e3457b4 added Del() calls for the PA structures/machines 2014-02-02 05:02:09 -03:00
Giacomand 923f46a3a2 Updated the MiniStation map with some minor tweaks. 
Added an overlay for the TEG that will display the status of the pipes.
Updated the generator instructions.
 2014-01-31 15:40:07 +00:00
Razharas b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
 2014-01-31 05:20:59 +04:00
Malkevin 302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes 
Conflicts:
	code/game/objects/items/toys.dm
 2014-01-30 19:14:43 +00:00
fleure 3a0d12838a Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity 
Adds sanity checks to Robotlimb repairs [BUGFIX]
 2014-01-30 10:40:12 -08:00
Razharas b0a5ae747d Added SMESes and some turbine fix 
Hope it works
 2014-01-30 22:21:43 +04:00
Giacomand 7a76e9456b Ported the MiniStation branch. 
MiniStation is now a single folder which isn't included by default. When you tick the code file for the ministation map, like with tgstation and metastation, it will then include the necessary code files itself. These code files modify certain datums, like jobs, supply packs and uplink datums.

The modified files outside the MiniStation folder are modifications made by the MiniStation branch which aren't changes exclusive to MiniStation.

Such as changing the unused circulator, which only MiniStation used, so that it was fixed and would correctly match the direction of the thermal generator.
The TEG was also changed to have a better interface and to include the above fix.
The department security was changed so it wouldn't runtime if it didn't find a checkpoint.
The preferences' SetChoices was changed so that the screen would automatically grow for every column in the job list.

The main difference between this version and the forked version is that the Unemployed and the Lieutenant was reverted back to their original names; since it would've been a massive pain to add support for that.
 2014-01-29 22:36:10 +00:00
Robson Richards 859d909a2b Adds sanity checks to Robotlimb repairs 2014-01-28 17:03:25 +00:00
Razharas a6ae0c06d4 Added constructable turbines 
By Number's request
Also fixed some other minor stuff
 2014-01-28 03:51:03 +04:00
Malkevin a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-26 19:22:33 +00:00
Razharas 13d3cb21ce A bunch of fixes of using old type of proc 
Now it all deconstructs properly
 2014-01-26 11:56:14 +04:00
fleure e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes 
Robotic Repair Missing fixes [Fixes #2326]
 2014-01-24 11:17:54 -08:00
Razharas d0abafed36 Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-22 10:11:00 +04:00