mwerezak
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
GinjaNinja32
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
Zuhayr
a3f3009eb4
Fixes #9063
2015-05-30 05:16:01 +09:30
Zuhayr
3cae318716
Merge pull request #9370 from comma/frankenstein
...
Frankenstein
2015-05-25 13:56:40 +09:30
Chinsky
77519d160f
Generalized head reattachment to work with all limbs.
...
Now you can attach your useless chunks of meat back!
Needs second step to make meat limb usable, use hemostat/cable/mousetrap.
Changes how organs 'die'. Instead of damage they now acquire germs, 2-6 points per tick, twice faster after hitting acute infection stage. Once they reach necrosis stage, they die. All in all it takes ~7 minutes for organ to go bad without a freezer.
As a bonus, you can now attach robogroins and roboheads (no brain included)
Fixes stumps being un-cuttable, which prevented all kinds of fun stuff with replacements.
Removed ORGAN_DESTROYED check from processing, take_damage should be taking care of that now.
2015-05-19 07:09:00 +03:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
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
PsiOmega
7cbd72d1be
Cleanup.
2015-05-07 09:09:12 +02:00
PsiOmega
fe09ed1a22
Merge remote-tracking branch 'upstream/dev' into BorgModules
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +02:00
PsiOmega
e54fbcb9ec
Cleans up borg module code and responsibilities.
2015-04-26 12:00:30 +02: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
Neerti
326fde4c5f
Adds the research module, condensed into one commit so far.
2015-04-04 20:17:59 -04:00
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
mwerezak
611a42bb33
Gun cleanup and rewrite
...
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.
Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication
Changes path strings to actual paths. Changes relative paths to absolute paths.
Renamed several targeting vars to make their purposes more clear.
Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +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
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Atlantiscze
19864ff3fe
world << removal
...
- Removes world << which was triggered by robotic reset modules.
2014-09-21 04:09:01 +02:00
DJSnapshot
e6b5681db0
Rest of the fixes for custom borgs on module reset.
2014-09-14 06:22:46 -07:00
PsiOmega
4b4c2d11fa
Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.
...
There is potential for breaking out all the special stuff for laser code but for now I'm happy to simply have a shared codebase.
I imagine pathfinding/patrolling may be sharable with bots in general as well.
2014-09-04 12:38:51 +02:00
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
Zuhayr
5ad652e90c
Fixes #5195
2014-06-14 18:48:13 +09:30
Jeremy Liberman
d23340a49b
Mutiny Mode
2014-05-11 15:03:50 -05:00
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Jarcolr
e050251c81
Cyborg hud modules now have proper icons
...
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
2014-05-04 16:06:10 +03:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Kyrah Abattoir
2f0a0243e9
code/game/objects/items/robot/* lowercase pass
...
NOTE: vision modes have to be proper.
Conflicts:
code/game/objects/items/robot/robot_parts.dm
code/game/objects/items/robot/robot_upgrades.dm
2014-01-08 19:47:48 +00:00
Erthilo
b75d97a488
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/machinery/kitchen/gibber.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/reagents/reagent_containers/hypospray.dm
maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
Erthilo
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
Segrain
f1f6c07ded
Same mapfix, part 2. Also, minor update.
2013-08-24 09:35:14 +03:00
Zuhayr
75896a8824
Fixes from Ravensdale to robot code, unsure of issue numbers.
2013-08-22 16:10:06 -07:00
Zuhayr
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
Erthilo
459aafd523
Fixed borg sprites no resetting with reset board.
2013-08-11 21:32:02 +01:00
Segrain
726cf4abb0
Robotic cameras again.
2013-07-28 00:39:25 +03:00
Segrain
5abed5a5f6
Modtype tweak.
2013-07-05 20:10:39 +03:00
