Commit Graph

993 Commits

Author SHA1 Message Date
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/ZAS/FEA_system.dm
2012-11-17 00:20:23 +04:00
Ater Ignis
a96e4c3600 if amputated full arm or leg, make hand or foot amputated too 2012-11-16 19:00:45 +04:00
Chinsky
262315d15c Added chance to get hands bloody during operation.
Or being covered in blood when you nick an artery.
Moved bloodying code in separate procs.
Made possible to force wounds to be internal, made some wounds in failed surgery steps internal.
2012-11-16 13:49:28 +04:00
Chinsky
cee6603d59 Fixes for some surgery messages. 2012-11-16 00:57:34 +04:00
cib
0d03f87958 Made autopsy age estimates use station time. 2012-11-14 21:40:46 +01:00
cib
2b5d3cac39 Fixed a few organ getter bugs. 2012-11-14 20:59:38 +01:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
cib
09cbf1f684 Fixed a compile error. 2012-11-14 16:45:22 +01:00
cib
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
cib
e5b62c98c6 Restructured alien removal surgery.
This way it later can be used for lung surgery.
2012-11-14 13:54:18 +01:00
cib
48f84e711a Added pain messages to alien surgery. 2012-11-13 18:28:27 +01:00
cib
78ed2e54eb Added alien surgery. 2012-11-13 18:22:48 +01:00
cib
c7b8bda2af Merge branch 'master' of github.com:CIB/Baystation12 2012-11-13 17:14:58 +01:00
cib
2eb4022fe4 Surgery now triggers specialized pain messages if not done with anesthetic. 2012-11-13 17:06:06 +01:00
aranclanos@hotmail.com
dee7b74a45 -Changed turf creations, merging everything to only one proc
-Fixes Issue 1085 - Artificers creating turfs with buggy lighting
-Spells now will use the proper proc to create turfs

Due to the amount of files changed, this is just the 'part one'. The merging in turf.dm is not finished, mineral walls and buildmode are still using the old system. The creation of turfs on the game panel is not using the proper procs yet. Stay tuned for this changes, but now, sleep.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5054 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 13:39:00 +00:00
CIB
d693836fb2 Fixed a small issue with germs 2012-11-13 14:12:40 +01:00
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code.
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
Chinsky
a2f4c91e4a Made limbs prepeared for replacement stop hurt. 2012-11-09 18:07:02 +04:00
Chinsky
5043147cfc Added prothesis instll surgery. 2012-11-09 13:22:55 +04:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
elly1989@rocketmail.com
8720dd0e69 Removed the blinking from buildmode. There's no point in having to download additional dynamic icons just for that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5000 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:42:23 +00:00
elly1989@rocketmail.com
50fe648a91 Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.
SERVER HOSTS:
This commit replaces the existing admin-rank system. It is now more customizable.
Admin.txt essentially works the same as it always has. Each line should look like:
ckey - admin rank

There is now however, an admin_ranks.txt. This textfile allows you to define ranks like so:
admin rank +ADMIN +FUN +BUILD
the +KEYWORD are flags adding permissions to that rank. There are brief descriptions in the text-file explaining what they do.

You can now name the ranks anything you like, and give them the permissions you want them to have. This allows, for instance, ranks like:
Game Admin on disciplinary +ADMIN +BAN
This would give that game admin only the tools they need to admin. They would not have access to 'fun' verbs which control events and antags.
There's lots of things you can do. For instance, a coder rank whom can debug stuff but cannot do admin tasks:
Codermin +DEBUG +VAREDIT +SERVER

There's lots you can do. As it evolves it will hopefully become more flexible.

admin_ranks.txt defaults to use the old admin rank names.

Apologies in advance as there will be a lot of anomalies, such as ranks losing verbs they once had. Please let me know about any problems. I can fix them quite easily simply by moving verbs between the lists or splitting the lists up into new flags.

CODERS:
There is now a check_rights(flags) proc. 
It check is usr is and admin and has -at least one of- the rights specified.
It checks > usr < not src, so keep that in mind!
If you need to check if something other than usr has specific tights, you can do if(holder.rights & R_ADMIN) etc.

KNOWN ISSUES:
+FUN probably needs to be split up into +MOBS and +EVENTS
In-game promotion/demotion is currently disabled. It will be readded after everything else works ok.
Erro's sql rights changes stuff is currently commented out. It will be re-added.
There are still many many verbs which need updating.

Apologies in advance for any inconvenience.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4991 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 10:23:04 +00:00
Cael_Aislinn
6bda733e37 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-30 23:53:42 +10:00
Chinsky
5281cbf2e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery.
Viruses2 do not spawn anywhere yet, until machinery is on map.
2012-10-29 04:27:58 +04:00
Cael_Aislinn
10034cdac4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-29 02:19:28 +10:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Spamcat
609c75fe58 Matches can be put in ashtrays as well. 2012-10-25 23:37:32 +04:00
Cael_Aislinn
96813cac8e another partial fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 21:30:26 +10:00
Cael_Aislinn
e8be4ac9f8 fixed kobolds (?) brought in supermatter and cleaned it up a bit
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 20:30:40 +10:00
Cael_Aislinn
7aee209637 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-25 00:35:19 +10:00
Cael_Aislinn
721dfeda57 removed old taj files
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-23 23:14:38 +10:00
Chinsky
4d9d407aa6 Added back tape rolls.
Two rolls in engie lockers because there are only tow lockers on map
2012-10-22 00:16:22 +04:00
cib
fafe46e197 Added internal wound surgery. 2012-10-18 13:32:45 +02:00
Chinsky
eb6d63cc07 Should be everything for surgery for now.
-Fixed some more messages.
-Added that if you try to set not broken bone with bone setter, you won't like the result
-Moved code for fracturing bones to the separate proc.
2012-10-15 15:13:34 +04:00
Chinsky
44675fb12e Surgery was working, yes yes, but not good enough, no.
Must stay true to the System, yessss.

Aside form fixing lots of mix ups with who cuts who in messages, separated some steps in their own datums.
-mending skull from setting bone (different message and different failure penalty)
-incising eyes and face (2 separate steps) from generic incising (different start condition (eyes), different messages, different failure penalties)
-cautering eyes and cautering face (2 separate steps) from generic cautering (different messages, different effects on success, different penalties on failure)

COuld have realized them as cascade of ifs in generic steps, but though this way will be more in spirit of step system, and generally a bit more readable, if longer.
2012-10-15 01:50:22 +04:00
Chinsky
9befbd6aa9 Surgery done. 2012-10-14 20:31:07 +04:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop.
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
2012-10-14 02:15:23 +04:00
Chinsky
b2d3d880e1 More work on surgery system.
Appendectomy fully working
Bone surgery working

Added bone gel and bone setter items

Made bandaging stop bleeding instantly, instead of waiting for next wound update.

Added variabe to groin organ to track appendectomy stage.
2012-10-13 16:28:10 +04:00
Chinsky
0062879e1a Merge branch 'master' of https://github.com/CIB/Baystation12
Conflicts:
	code/datums/organs/organ_external.dm

Carried over my previous commit with CIB's change.
Used bandage() proc in surgery step too.
2012-10-13 14:02:04 +04:00
Chinsky
2c41cd775f Some work on surgery system.
Added steps for
cutting wounds open;
clamping bleeders;
retracting skin flap;
cauterizing;
cutting appendix;
removing appendix;
2012-10-13 13:14:50 +04:00
cib
fbc903e59c Added a new surgery system. 2012-10-12 11:09:21 -07:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
2012-10-05 22:21:26 +10:00
elly1989@rocketmail.com
6909f8dd91 removed src arguments from new /obj/screen(src) as src was a datum anyway. This is to remove confusion.
When hud_used is deleted, references to those objects are removed, hence they are garbage collected.
Removed some code from metroids which could possible delete global_hud objects which would cause problems.

Added a verb to code/WorkInProgress/carn/debug_locnull.dm which prints all atoms with loc==null to world.log

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4774 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 11:35:24 +00:00
Cael_Aislinn
56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport
Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:13:57 +10:00
Cael_Aislinn
ad75e6b352 merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:09:20 +10:00
elly1989@rocketmail.com
c81c70bd86 Replaced var/netnum for cables and powered machines with a direct reference to their powernet. The bug which was causing cutting and merging powernets to fail was due to my attempts to fix the powernets slowly becoming filled with null entries. Removing those null entries messed up the indexes and essentially jumbled up the powernets. :( sorry
Fixed the failsafe misreporting how long the MC has been dead.

Lighting initialization no longer 'interrupts' the master_controller setup().

Added updated powernet debugging tools. They're in my WIP folder. They are sexy c: It draws the powernet onto the map so you can see what's going on during debugging.

Added tachyon-doppler arrays. They're gonna be something for scientists to measure their bombs with rather than praying for the figures. Nothing spectacular.

Commented out switches, they aren't used and I've been fixing/testing powernets all day. Sorry. If you need them back  just PM me and I'll fix them.

Known issues: the merging procs behave silly at intersections. I really tried to fix it but I think I'll make more progress just working on some powernet improvements.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4623 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-05 16:14:24 +00:00
Cael_Aislinn
dc3f6f2239 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:23:50 +10:00
Cael_Aislinn
c4bd191222 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj.dm
	code/game/gamemodes/events.dm
	code/game/machinery/newscaster.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/turfs/turf.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/maps/fromdmp.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_movement.dm
	code/setup.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:19:03 +10:00