Commit Graph

91 Commits

Author SHA1 Message Date
SleepyGemmy
836818d104 Clarifies Bone Repair Options (#14985) 2022-11-03 13:39:21 +01:00
KingOfThePing
0775b40e62 Round Quattro Bugfixes (#14612) 2022-08-14 12:20:22 +02:00
Matt Atlas
612621bbc1 Adds a cautery to the Investigations tray so they can close bodies up. (#13651) 2022-04-28 00:15:57 +02:00
alberyk
8c1d2a7cde Merge branch 'master' into final_away_maps_additions
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
2022-04-04 19:47:58 -03:00
VisVirific
68cf583f8b surgery tool description fixes (#13376) 2022-03-12 14:17:42 +01:00
alberyk
00e9a6b728 UNshits robotics 2022-01-31 00:26:06 -03:00
Casper3667
63c6d26c90 Changes some parts of forensic (#12869) 2022-01-16 14:20:23 +01:00
Casper3667
be6fc44fe3 Adds autopsy tool trays (#12265)
* Adds autopsy trays

* Limit autopsy trays slightly

Co-authored-by: TheGreyWolf <mc-casper@hotmail.dk>
2021-08-05 13:02:05 -03:00
MarinaGryphon
00d6879aff Enforces TRUE/FALSE for edge (#11495) 2021-03-24 00:20:12 -03:00
Jiří Barouš
524bf9c417 Mitigates (autolathe) recycling exploits by minimizing what can be recycled, adding unit tests and fixing the recipes (#10375)
* Mitigates research recycling exploits by minimizing what can be recycled

* Moves the research design check into a new unit test

* Adds unit test for stack material recipes costs and fixes these costs

* Instead of changing recipes the resulting materials are worth less

* Crap fix
2020-10-30 12:20:59 +01:00
Alberyk
d89c2cf204 Fixes the circular saw not using the proper in hand sprite (#10180) 2020-10-04 19:24:30 -03:00
Wowzewow (Wezzy)
307c214541 makes w_class use defines (#9848) 2020-09-06 17:37:56 -03:00
MarinaGryphon
f060df8b24 Cooking Update: Cooking Moona (#9454) 2020-09-02 10:49:14 +02:00
Matt Atlas
0dd08df5b2 Refactors sound groups to use decls instead of a massive switch with dozens of global lists. (#9702) 2020-08-28 20:47:00 +02:00
Wowzewow (Wezzy)
7114d3525f More new sounds and fixes equip sounds (#9464) 2020-08-12 11:17:39 +02:00
Wowzewow (Wezzy)
89eb38177a The awesome fancy box update which looks super epic, immersive and cool (#9331)
rscadd: "The cookie snack now contains cookies, like the mint and gum packs. They've also been added to the rations box selection."
    rscadd: "Gum packs, mint packs and the cookie snack from the vending machines visibly open when clicked on."
    rscadd: "Gum packs, mint packs and the cookie snack can be crumpled up when empty. If you really wanted to, you still can crumple it with things inside, so long as you're in harm intent."
    rscadd: "Odd boxes, such as candle boxes, donut boxes, crayon boxes and egg boxes can be folded and unfolded from cardboard sheets."
    rscadd: "Donut boxes, egg cartons and cigarette packets visibly open when clicked on. Alt-click to close."
    rscadd: "Mints actually have a proper taste description now."
2020-07-18 00:10:53 +03:00
Geeves
33ad8096fb The Great Spanning (#9320)
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
2020-07-12 15:53:28 +03:00
Wowzewow (Wezzy)
fad8415a8e Pickup, Drop and Equip sounds (#8861) 2020-05-22 15:40:00 -03:00
Wowzewow (Wezzy)
b9b42f4f8f Janitor, hydroponics and medical inhands (#8456) 2020-03-21 13:36:49 +01:00
Matt Atlas
82437acd43 Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
2020-03-18 20:19:11 +01:00
Wowzewow (Wezzy)
f0d273af97 Fixes fancy box wrong description (#7550) 2019-12-02 20:24:28 +01:00
Matt Atlas
5da2a9c24b Splits organs into organ/internal (#7441) 2019-11-20 23:07:10 +01:00
Werner
af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
fernerr
298927561b Makes the surgery tray inventory open when clicked. (#7043)
Made it so clicking a surgery tray opens its inventory, use click/drag instead to pick the tray up.
Also made the tray spill if you hit someone or throw it.
2019-09-26 23:09:18 +03:00
fernerr
32873fbeb9 Makes it so surgeons no longer mistake their tools for donuts (#7041) 2019-09-23 01:08:07 +04:00
alsoandanswer
d2af3fe861 Tweaks some coder-sprites (#7011)
Tweaks some coder-sprites.
2019-09-22 15:24:54 +03:00
Matt Atlas
cf0fc45ab2 Surgery trays, material knife shrapnel extraction, ghetto stitches (#6940)
Also adds a framework for custom bandage descriptions.
2019-09-07 14:42:36 +03:00
alsoandanswer
1bab746d17 adds new sounds (the not stupid version) (#6307) 2019-05-05 23:51:08 +02:00
PsiOmegaDelta
1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
GinjaNinja32
c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
mwerezak
d541fda7be Sets w_class for external organs
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
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
Kelenius
db30c15e4c Updates to science
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03: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
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
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04: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
ZekeSulastin
72eba68bd8 Added laser scalpel items 2014-02-25 15:09:46 -05:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Zuhayr
63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-11 15:01:48 -04:00
Furlucis
24098c6529 UNadded robotic hands and feet because there was no point in doing this in the first place.
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-05-31 22:32:39 -04:00
Furlucis
17860ff33a Added robotic hands and feet.
Apply screwdriver to robotic arms and legs to get hands/feet. They can
be surgically attached properly, far as I can tell. Also, fixed a few
backwards slashes in text marcos.
2013-04-19 00:41:45 -04:00