cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,682 Commits 9 Branches 0 Tags
d477b7230fa161a22ab71aa2bc4aa6ce7e2fdbbc
Commit Graph

914 Commits

Author SHA1 Message Date
Cael_Aislinn
c270fdb2ba compile and misc other fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 13:23:43 +10:00
Cael_Aislinn
c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 13:06:03 +10:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport 
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 14:13:11 +10:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
Hawk-v3
9df91430fd Merge pull request #2097 from comma/surgery 
Surgery
 2012-12-22 08:27:18 -08:00
Chinsky
b3580e8265 Merge branch 'master' into surgery 2012-12-21 01:07:36 +04:00
ericgfwong@hotmail.com
3a928012f1 Updated Department Security files to work with the new 2.1.0 map. 
Updated the relevant readme file
Updated 2.1.0 with some missing air alarms and fire alarms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5362 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-20 00:28:13 +00:00
cib
96fb7cf14b Rebalanced spaceacillin metabolism. 
It used to be something like 1 unit per tick, which only lasted around 2
minutes for 15 units. Now it'll last a bit longer, making it actually
useful.
 2012-12-11 13:22:44 +01:00
petethegoat@gmail.com
15a80594a6 Fixed the softcurity readme. 
Added grabbing cigarettes with your mouth for Malkevin.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5290 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-10 00:56:42 +00:00
petethegoat@gmail.com
fcf95c8d6f git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5281 316c924e-a436-60f5-8080-3fe189b3f50e 2012-12-08 00:41:32 +00:00
petethegoat@gmail.com
4b2a9d1b59 Added department sec experimental code. 
Removed the softcurity map from the repo as it was a waste of space.
It's still available here; http://tgstation13.googlecode.com/files/tgstation.2.0.9_Softcurity.zip

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5277 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-07 19:51:57 +00:00
petethegoat@gmail.com
fe3acba8e7 Added a 'softcurity' or 'sissycurity' folder for TLE to run on Sigyn. 
Of course, everyone else is welcome to try it out, but it is a massive nerf to sec.

It's an experiment, nothing more. Don't get your panties twisted.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5272 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-06 23:45:41 +00:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 17:49:34 +10:00
Chinsky
c13ddeeb9f Merge branch 'master' into surgery 
Conflicts:
	code/datums/organs/organ_external.dm
 2012-12-01 07:16:40 +04:00
Chinsky
faa084a955 Fix for lung surgery. 
Fix for internal wounds surgery messages.
 2012-11-25 15:20:08 +04:00
Chinsky
4e4db63889 Fixes healthy appendix spawning always, regardless of if mob had appendicitis or no. 
Also possibly mobs did not get resistance to appendicitis.
 2012-11-22 23:40:24 +04:00
Chinsky
df3c514db9 Made bloody hands got during surgery not stain tools. 2012-11-22 18:46:33 +04:00
Chinsky
5a62904fe1 Merge branch 'master' into surgery 
Conflicts:
	code/datums/organs/organ_external.dm
 2012-11-22 15:18:42 +04:00
Chinsky
eb1d24429a Fixed typo and wrong colors for ribcage surgery messages. 2012-11-22 15:16:17 +04:00
Chinsky
8270ea9b9e Made incubator eat right chems, issue #1991 2012-11-21 23:05:13 +04:00
Chinsky
59a31bab86 Added delay to vessel repair surgery. 
Fixed metroid core surgery exploit.
 2012-11-21 08:19:10 +04:00
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