Commit Graph

15894 Commits

Author SHA1 Message Date
Loganbacca
76d87e7c84 Tape fixes
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
2014-12-02 23:45:33 +13:00
Loganbacca
26d428e659 Reverted wall repairing with tape 2014-12-02 23:17:46 +13:00
Loganbacca
224b2f3899 Duct Tape
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
PsiOmegaDelta
529a610613 Merge pull request #7197 from Amunak/patch-1
Supermatter and SMES coil supply pack price changes
2014-12-02 07:21:40 +01:00
PsiOmegaDelta
b05c966b64 Merge pull request #7198 from atlantiscze/interactions
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
PsiOmegaDelta
d6ea2b887a Merge pull request #7201 from SparklySheep/patch-9
Adds pAI cards to the loadout.
2014-12-02 07:20:50 +01:00
Zuhayr
17f32c3ab3 Replacing a loop with the older code. 2014-12-02 02:58:26 +10:30
Zuhayr
33406d6e47 Removing macros. 2014-12-02 02:51:14 +10:30
Zuhayr
42c6efbc61 Fixes most of #7206, fixes #7200, fixes #7184 2014-12-02 02:34:34 +10:30
Zuhayr
8240f14176 Fixes #7185, works on #7184 2014-12-01 23:55:03 +10:30
PsiOmegaDelta
a1a66870ca Merge pull request #7203 from Zuhayr/unarmed
Refactoring the context-based combat PR v2
2014-12-01 11:17:14 +01:00
Zuhayr
487117a0ae Reverting a now unneeded var change. 2014-12-01 20:42:32 +10:30
Zuhayr
bee0b9d23d Tweaks after testing. 2014-12-01 20:20:30 +10:30
Zuhayr
d65ead4f7e Changed \red to span in unarmed_attack.dm. 2014-12-01 20:10:27 +10:30
Zuhayr
0ae473b6ea Removed antag role buffs. 2014-12-01 20:06:43 +10:30
Zuhayr
855f75bd3c Removed magboot stomp. 2014-12-01 20:03:08 +10:30
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes
Minor changes to drone borg sprite.
2014-12-01 06:46:46 +01:00
PsiOmegaDelta
651008b822 Merge pull request #7176 from Amunak/super-patch
Supermatter fixes, code cleanup and refactoring. Shards don't announce anything.
2014-12-01 06:46:28 +01:00
SparklySheep
f8bc1708af Lowered to 2 points. 2014-11-30 23:20:24 -06:00
SparklySheep
0a43dd0860 Adds pAI cards to the loadout. 2014-11-30 23:12:04 -06:00
Zuhayr
016a9d8ba2 Merge branch 'unarmed' of https://github.com/Zuhayr/Baystation12 into unarmed 2014-12-01 15:33:07 +10:30
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev
Hardsuit fixes.
2014-12-01 05:58:24 +01:00
Atlantiscze
64f9a502f9 Mining robot module upgrade
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
2014-12-01 05:11:35 +01:00
Atlantiscze
166288293b Cyborg Atmospherics Tools!
- Matter Decompiler now clears unused pipe assemblies. Long gone are the times where cyborgs couldn't remove old pipe parts.
- Engineering and Construction cyborgs now have pipe painter tool, which allows them to paint pipes properly.
2014-12-01 03:39:36 +01:00
Atlantiscze
772e42fd75 APCs now use percent-based channel values.
- Equipment now once again shuts down when APC reaches 30%
- Lighting shuts down at 15%

This is now correctly based on APCs power cell, instead of being hardcoded. This means atmospherics and similar areas won't just suddenly go from all lit working room to darkness.
2014-12-01 02:54:15 +01:00
Amunak
2ca4ccd23a Lowered SMES coil price to 75
It is a valuable piece of technology, but alone it is not really powerful at all. This is the same price as the RUST core and TE generator, which are both admittedly much more complicated. I know this was for balance reasons, but as it is now engineers will rather steal the coils from solar panel SMESes than to deal with cargo who are not very supportive of ordering expensive stuff like this.
2014-12-01 02:27:17 +01:00
Amunak
e2a2d5f06e Upped Supermatter core price to 150 supply points
This is to prevent griefing using supermatter (it is bad if I can order four of them after ~20 minutes in game and destroy most of the station with them) and to be coherent with the lore - SM is SUPER FREAKING EXPENSIVE. Also (hopefully) makes the crew think before ejecting the SM 4noraisin.
2014-12-01 02:24:04 +01:00
Atlantiscze
afadcdc35a Increases AI power usage
This commit increases AI power usage to 50kW. This was discussed on codershuttle and should (/w some minor lags) give the AI approximatey 60 minutes of power with fully charged SMES.
2014-12-01 02:06:03 +01:00
Atlantiscze
e2196fe6ec Robotic Cable Coils
- Cyborgs and Drones can now use change-colour verb to change colour of their integrated cable coil.
2014-12-01 02:02:11 +01:00
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
Zuhayr
14cf4aa8e3 Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc 2014-12-01 00:37:13 +10:30
Zuhayr
9b5235016b Set the hazmat rig to use the medical rig icon for now. Woo placeholder sprites. 2014-11-30 23:50:54 +10:30
Zuhayr
3a312b4a03 Fixes #7179 2014-11-30 23:49:55 +10:30
Zuhayr
a5ee32d4ca Fixes some colour macros, removes inactive jetpack icon for rigs. 2014-11-30 23:47:34 +10:30
Zuhayr
7703b0f4c0 Fixes #7186 2014-11-30 23:47:12 +10:30
PsiOmega
0731badf87 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm
2014-11-30 10:54:15 +01:00
Chinsky
1ac4b90368 Merge pull request #7161 from PsiOmegaDelta/MapReaderFixes
Fixes Map Loader issues.
2014-11-30 12:51:21 +03:00
Chinsky
dbf69cba81 Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs
pAIs can now hide.
2014-11-30 12:50:44 +03:00
Chinsky
c0e54f23cf Merge pull request #7152 from PsiOmegaDelta/RoboCircuit
Robo circuit
2014-11-30 12:50:36 +03:00
Chinsky
27736e5ce3 Merge pull request #7137 from atlantiscze/buildable-smes-fix
Buildable smes minor changes
2014-11-30 12:50:19 +03:00
Chinsky
edede8ad34 Merge pull request #7153 from PsiOmegaDelta/BeaconBanCheck
Syndicate Beacons no longer attempt to convert traitor banned players.
2014-11-30 12:50:12 +03:00
PsiOmega
5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm
2014-11-30 10:47:36 +01:00
Zuhayr
4c1ea8cd3a Several hardsuit fixes. 2014-11-30 12:46:03 +10:30
Zuhayr
c7973e0ab2 Made suit boots children of magboots. 2014-11-30 11:12:15 +10:30
Zuhayr
1500dbd505 Fixes #7128 2014-11-30 10:52:35 +10:30
Amunak
5a8a9c2816 Supermatter warning now has its own proc. Fixed some SM bugs.
Added logging for when SM explodes. The delay of regular warning was made *higher* (from 15 to 20 seconds) because of a bug; Delay of the emergency warning was lowered (from 30 to approx. 12 seconds). The announcement of 'returning to safe levels' now happens only once. The  spawn .. explosion and irradiation and hallucinations are now also applied only once (which means they may need some tweaking, but I have no idea if they stacked anyway; mainly the code should now be much more efficient).
2014-11-30 00:23:55 +01:00
Amunak
45b314bd60 Moved shard to the bottom of the file, tweaked its values.
Also added the time between delamination and actual explosion (pull time) as a separate val and lowered it for the shard.
2014-11-30 00:16:54 +01:00
Amunak
889442ef93 Supermatter code formatting 2014-11-30 00:07:54 +01:00
Atlantiscze
0b414ca3db Merge remote-tracking branch 'origin/dev' into nice-atmos
Had some strange merge problems. This may have broken something. Visual map inspection however shows no problems.
2014-11-29 23:51:07 +01:00
Chinsky
8cdd094e1b Merge pull request #7156 from PsiOmegaDelta/RadioFix
Radio fixes
2014-11-30 00:56:53 +03:00