Commit Graph

93 Commits

Author SHA1 Message Date
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta
65fc980b20 Stack splitting and cable merging fixes.
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
5b037670b3 Removes most instances of item_color
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Atlantiscze
90a83c19cf Hardsuit powersink module now uses CELLRATE properly
- Adds CELLRATE (and SMESRATE for SMESs) into drain_power proc.
- Adds "amount" parameter to drain power proc, sets the powersink module to 40kW draw (80 cell charge/s), which should correspond with normal cell recharger.
- Removes drain_power from all machinery, and adds drain_power to machinery/power. This means you can only drain from machines that have something to do with wiring or electricity.
2014-12-29 20:40:57 +01:00
Loganbacca
2ff0a2bf5d Revert updateicon changes
- Fixes cable T-Ray rendering caused by /tg/ powernet code port
2014-12-13 00:10:30 +13: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
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
PsiOmega
0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Atlantiscze
6db4b04dc0 Colored Cable Fix
- Cables are now properly colored when placing them with colored cable coil (instead of always making red cable)
- Removed duplicate definition of color (color and item_color), only var color is now used. That probably caused this issue in first place.
2014-11-05 11:12:39 +01:00
PsiOmega
a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
PsiOmega
9bcbdc6dc5 Fixes bad tabbing, only evident when placing Z-crossing cables. 2014-10-14 14:14:46 +02:00
PsiOmega
a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
PsiOmega
36c9f65bb1 Ports /tg's cable and powernet code to our code base. 2014-10-10 14:59:44 +02:00
Atlantiscze
7bb01ca020 Breaker Box update
- Added suggestions by mwerezak and comma
- Directions list is now in variable
- Type changed to /obj/machinery/power/breakerbox
- Instead of using loop visible_message() is used now.
2014-08-30 20:54:41 +02:00
Atlantiscze
e1b38f9d38 Adds Breaker Box
- Basically, reworked powerswitch. Powerswitch was commented out and this commit removes it completely, as Breaker Box is partially using it's code.
- Breaker box is device designed for advanced grid control. Allows you to connect/disconnect wires WITHOUT having to cut them manually.
- This update mostly improves interaction, and adds AI support (as i already saw many AIs which are actually good in balancing things. This will help them a bit. Engineers can do it manually too.)
2014-08-29 20:21:46 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
Loganbacca
d1a729f5db Fixes incorrect cable coil colours 2014-06-23 21:44:51 +12:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
Mloc-Argent
c9a2a4fad0 power: cables show up right on map again
Cables are red/whatever color on map again instead of white.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-09 18:53:44 +01:00
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Mike
fa1fd3cb24 Made single cable pieces have w_class = 1
Single cable pieces have w_class = 1 and can be tucked behind the ear.
2014-04-05 01:21:30 -04:00
Loganbacca
d1b37a5392 Fixed cable colors
- Fixed a couple of lines of code in power.dmi so that cables correctly update their color
- Fixed the contrast of the cable icons
2014-02-13 17:05:07 +13:00
Chinsky
ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
Chinsky
6175ef8012 Moved cable definition to cable.dm because what the fuck. 2014-01-19 03:05:48 +04:00
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color.
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
2014-01-19 03:02:58 +04:00
LBraindead
cfcb3e65cd Update cable.dm
cable construction
2014-01-18 00:19:08 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-22 12:39:48 +01:00
Chinsky
4d7aa320cb Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
Just got to tip of real tree and got zipball, then unpacked it here.
2013-02-07 07:13:27 +04:00