cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,427 Commits 10 Branches 0 Tags
5b13445e9540532000aed2bc925014d3173fce35
Commit Graph

697 Commits

Author SHA1 Message Date
jediluke69
9d83bd52b5 Added a shotgun shell ammo crate 2013-04-27 21:42:56 -04:00
adammartinez271828
3b95bf2279 Updates to sun.dm and solar.dm 
Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer.
 2013-04-07 10:17:41 -04:00
Asanadas
0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-21 02:59:29 -04:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder. 
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
 2013-03-14 11:52:53 +04:00
Chinsky
28290d4852 Fixes issue with 0 toxloss giving people worst pain message. 2013-03-14 08:56:13 +04:00
Chinsky
f36ebe3b9d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-14 05:07:14 +04:00
Chinsky
f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky
4c7f1f21d9 Merge pull request #2525 from CIB/feature 
Crew transfer votes now have a bias depending on how far into the round.
 2013-03-13 16:35:16 -07:00
cib
bb0ed9a2ab Toxloss now causes pain. 2013-03-13 17:04:02 +01:00
Chinsky
468defbdfb Made virus crate have virus2 again. 2013-03-13 06:15:56 +04:00
Chinsky
7e82d9064c Head blows now can cause brain damage. 2013-03-11 04:59:24 +04:00
Cael_Aislinn
86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:39:24 +10:00
Cael_Aislinn
20a3596460 re-added missing supply packs (supply packs without assigned groups are not orderable) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 18:45:11 +10:00
Cael_Aislinn
18f6136b25 tweaked a couple of supply packs (crate types, quantities), added missing rust fuel port circuitry supply pack, added supply packs for type 1 TEGs and circulators 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:33:59 +10:00
cib
65b8eafe8e Added internal organs. 
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
 2013-03-04 12:19:12 +01:00
Cael_Aislinn
a7a0e48d67 compile fixes, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 22:06:36 +10:00
Cael_Aislinn
3cc31685c0 fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 21:51:56 +10:00
Cael_Aislinn
1469ccb7f9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 19:39:05 +10:00
Cael_Aislinn
68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 19:38:50 +10:00
Chinsky
2ce64b77a7 Merge branch 'necrosis' into bleeding-edge-freeze 2013-02-22 23:46:54 +04:00
Chinsky
83eb9cac83 Commented out gangrene for now. 
I suck at branches, it got caught with my surgery fixes.
 2013-02-22 23:24:33 +04:00
Chinsky
f50fd49032 Gangrene! 
Now germ level for organ has three thresholds.
LEVEL 1: Occasional (prob(10) every tick) tox damage and germ level raise.
LEVEL 2: In addition to that, tox damage and germ level raise every tick.
LEVEL 3: Limb necrosis. Currently does nothing but icon change. Also at this stage germs start leaking to connected organs, so amputations is necessary.
 2013-02-22 23:12:27 +04:00
Cael_Aislinn
8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn
2c585fbcc4 moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 23:49:29 +10:00
Cael_Aislinn
66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 20:00:05 +10:00
Christian Bielert
f2b9816810 Merge pull request #2389 from comma/bleeding-edge-freeze 
Guns, medicine and fixes.
 2013-02-20 13:22:57 -08:00
Zuhayr
cdb3907493 Binary file merge conflict. 2013-02-20 00:28:14 -08:00
Zuhayr
1fe4cbb619 Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed. 2013-02-20 00:24:26 -08:00
Chinsky
df67151fe3 Merge branch 'master' into bleeding-edge-freeze 2013-02-20 09:18:14 +04:00
Chinsky
3202ac4ccf Fixes runtime with burn wounds not having enough stages. 2013-02-20 00:38:43 +04:00
Chinsky
334da25223 Added surgery to put things in people. 2013-02-18 13:22:23 +04:00
Chinsky
baec30f690 Moved procs around, added comments. 2013-02-17 22:06:26 +04:00
Chinsky
24351fbea8 Made all proc declarations full, updated indentation accordingly. 
Changed paths for wounds.
 2013-02-17 20:31:55 +04:00
Chinsky
ab9ed98f07 Removed all cases for monkeys, since they do not have organs anymore. 
Moved dropped limb icon generation code to it's New()
 2013-02-17 19:38:28 +04:00
Chinsky
92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway. 
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
 2013-02-17 19:12:00 +04:00
Erthilo
7827680f66 Fixes virus crate having no model and cost. 2013-02-13 17:09:54 +00:00
Chinsky
f25ba15c2f removed debug print 2013-02-07 05:48:19 +04:00
Chinsky
4739184104 OH GEE LET'S LET EVERYONE AND THEIR ADMIN OBSERVER MOM USE THESE VERBS NOTHING CAN POSSIBLY GO WRONG. 
Slapped rights checks on verbs in VV menu.
 2013-02-07 03:40:01 +04:00
Chinsky
fcb10b05d5 Should fix injured icons not updated. 2013-01-28 21:51:05 +04:00
Chinsky
d1972efbb8 Can order contraband crates. 
Moved most of 'contraband' out of crate to others.
 2013-01-28 18:07:34 +04:00
Chinsky
ebc6529b68 Fixed appendicitis killing people in 4 minutes. 
Also from stage 2 and on, symptoms of lower stages can appear too.
 2013-01-24 14:48:40 +04:00
Chinsky
d0ae053098 Should stop robolimbs bleeding. 2013-01-23 02:47:37 +04:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:48:07 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00
giacomand@gmail.com
015b19f800 - Added null checks for get_mobs_in_radio_range(). 
- Added a check to EI NATH for humans who are brainless.
- Fixed fires runtiming. When I replaced del(src) with a garbage collecting proc, I forgot to return afterwards so the rest of the code didn't execute.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5567 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 06:52:49 +00:00
aranclanos@hotmail.com
a8cb1dc4f8 Some improvement to the teleport scroll and spell code. It unbuckles the user now. 
Thanks to Nodrak~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5565 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-17 06:22:29 +00:00
Cael Aislinn
f472e07cc1 Merge pull request #2194 from comma/master 
Surgeray
 2013-01-16 17:57:05 -08:00
Cael_Aislinn
70764ac039 tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 23:20:00 +10:00
Chinsky
6d830af37c Merge branch 'master' into surgery 
Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm
 2013-01-15 13:42:13 +04:00
johnsonmt88@gmail.com
e5750c9f6b Alien-speak and silicon binary-chat should now work properly using # or . instead of : 
Fixes issue 1243.

Committing for Startoad:
The janitor supply crate (from cargo) now comes with a trashbag inside.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5550 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-14 23:31:04 +00:00