Commit Graph

914 Commits

Author SHA1 Message Date
PsiOmegaDelta
68644b0e5e Merge pull request #7219 from Loganbacca/chairfix
Tape and chairs
2014-12-04 14:10:46 +01:00
Loganbacca
c4c90adc8e Added tape roll
- Added 1x tape roll to office supplies pack
2014-12-04 21:54:41 +13:00
mwerezak
77288fb951 Merge remote-tracking branch 'upstream/dev' into camera
Conflicts:
	code/game/machinery/portable_turret.dm
2014-12-03 23:37:02 -05:00
mwerezak
fad5506683 Cameras can be broken by weapons/projectiles, fixes
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021.
Some camera cleanup.
2014-12-03 10:36:30 -05:00
Ccomp5950
25224491ce Merge pull request #7195 from PsiOmegaDelta/BloodDrive
Cargo can now order empty blood packs.
2014-12-02 20:31:04 -05:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00: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
PsiOmega
957ff8314d Cargo can now order empty blood packs. 2014-11-30 16:45:52 +01:00
PsiOmega
c3a80e4ace Radio wires - Take 2. Can now also cut wiring. 2014-11-24 15:23:06 +01:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
PsiOmega
1e479536db Radio wires. 2014-11-24 10:19:57 +01:00
PsiOmega
bf24d288ea Particle acceleration wiring. 2014-11-24 10:12:57 +01:00
PsiOmega
2d832b19cd Mulebot wiring. 2014-11-24 09:50:19 +01:00
PsiOmega
2bfce70376 Autolathe wiring. 2014-11-24 09:17:22 +01:00
PsiOmegaDelta
7dd5da6793 Merge pull request #6896 from Hubblenaut/dev
Context-based Combat Part 1
2014-11-23 19:13:52 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
3ca02037ef Merge pull request #7088 from mwerezak/skrell
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
mwerezak
e6b5d4cf77 Skrell icon/appearance changes
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
2014-11-20 13:10:42 -05:00
Hubblenaut
70db4b52e8 Relocates combat log proc as a child of unarmed_attack, adds procs for
checking antagonists and close combat modifiers
2014-11-20 17:42:40 +01:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
PsiOmega
cad3c76986 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-17 11:59:41 +01:00
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
60a730b5d6 Automatic solar tracking again functional. 2014-11-14 08:12:39 +01:00
MagmaRam
d09d8cf921 Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else. 2014-11-11 12:47:02 -05:00
MagmaRam
3e5117e3eb All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.

This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
2014-11-11 11:27:11 -05:00
PsiOmega
f412eb8e1d Merge remote-tracking branch 'upstream/dev' into StateLaws 2014-11-07 09:42:53 +01:00
PsiOmega
f2dcf1acaa AI fixes
Telecommunication interruption no longer permanently disables the ability for synths to state laws if they attempt it during the downtime.
If a synth attempts to state laws during telecommunication interruption it now receives a clear feedback message about its impossibility.
Fixes runtime errors when AIs uses shortcut keys to operate APCs/turret controls when the corresponding window isn't open.
Adds missing AI-restriction check for turret controls.
Airlocks no longer lie about dropping bolts when they cannot be dropped.
2014-11-06 15:36:02 +01:00
PsiOmega
a9ef2b61c0 Wiring Upgrade
Continues the wiring upgrade. Now cameras, airlocks, robots, and air alarms also use the new wire datum system.
Global wiring code is now removed but there are sneaky objects which didn't rely on them such as mulebots and autolathes.

Fixes a few issues from the previous upgrade.
2014-11-04 14:27:46 +01:00
Chinsky
c8e27555b9 Merge pull request #6857 from mwerezak/hoverpod
Hoverpod tweaks and mecha/working code cleanup
2014-10-29 06:31:20 +03:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
mwerezak
4e7a8fac34 Hoverpod tweaks
Hoverpods are a subtype of mecha/working again, but drills are now
ripley specific. Hoverpods have increased cargo and can carry 3 tools.
Hoverpod crates now come with a clamp and passenger compartment
pre-installed.
Brings back the combatpod, can equip weapons.
2014-10-26 13:16:30 -04:00
PsiOmega
9a165c373d Can now order plastic sheets. 2014-10-25 18:06:07 +02:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
PsiOmega
97a5186cee Converts all machines relying on RandomAPCWires() to the new wire datum system. 2014-10-13 21:46:45 +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
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
PsiOmega
c94375acdb Cargo can now order body/stasis bags. 2014-10-06 08:09:28 +02:00
Zuhayr
63629a953b Added Add and Remove Organ options to VV. 2014-09-30 13:23:28 +09:30
Zuhayr
70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Gamerofthegame
33b9d19df1 Commit repair 2014-09-28 17:13:42 -04:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
GinjaNinja32
37d3418688 Fix runtime due to processing hydrotray at loc=null 2014-09-22 18:42:02 +01:00
Zuhayr
afde93e94d Adds random seeds to Cargo for Xenobotany. 2014-09-18 16:39:44 +09:30