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
10,659 Commits 10 Branches 0 Tags
73cdecd81db926c52f8e76cc58d0e4ecc7ce2030
Commit Graph

8210 Commits

Author SHA1 Message Date
Chinsky
73cdecd81d Replaced codersprite for bloodpack with new ones. 
Also now sprite changes depending on how filed bag is.
 2013-01-03 03:40:36 +04:00
Chinsky
5e24bc8f34 Added surgery caps. 2013-01-03 02:46:15 +04:00
Chinsky
8f0bdf752d Added 4 more AI status screens. 2013-01-02 19:49:31 +04:00
Chinsky
7b1732dda0 Moved global steps list and it's initializing to TG's new place for such things. 
Moved helper for checking if mob is down on some operable surface to unsorted helpers.
Checking for tool type now will properly work with subtypes (istype instead of comparing type var)/
 2013-01-02 18:38:31 +04:00
Chinsky
08605251b2 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-02 17:54:12 +04:00
Chinsky
8d0384ece4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-02 17:50:53 +04:00
Hawk-v3
2bf16b7241 Merge pull request #2122 from GauHelldragon/master 
Farmbots! Adds new file farmbots.dm
 2012-12-31 18:42:20 -08:00
GauHelldragon
e7d66f06cd Farmbots! Adds new file farmbot.dm 
A new type of buildable AI bot that assists in hydroponics
Waters plants, hoes weeds and uses fertilizers
 2012-12-30 15:24:58 -08:00
Hawk-v3
c612dd60da Merge pull request #2114 from GauHelldragon/master 
Robot HUD fixes
 2012-12-30 08:54:45 -08:00
Cael_Aislinn
5768d6a741 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-31 02:01:37 +10:00
Hawk-v3
20228b12cf Merge pull request #2117 from SueTheCake/master 
Away Mission + ERT/Sec/Soghun Rigs
 2012-12-29 05:55:29 -08:00
SueTheCake
313cd4a495 I'm an idiot and I forgot to change a mob's projectile. 2012-12-29 02:41:51 -06:00
SueTheCake
f7249bd519 Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added. 2012-12-29 01:59:19 -06:00
Cael_Aislinn
0e9d6c163d runtime fix. the original code here was intended to make projectiles work with autopsy, but instead it just caused runtimes and made some mobs invulnerable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 14:00:46 +10:00
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
GauHelldragon
50489f28ed Fixes cyborg display when items are disabled due to power. 
Previously the hud would not be updated when power drops below 100 and items are disabled.
 2012-12-28 13:51:09 -08:00
GauHelldragon
a116225433 Fixes cyborg HUDs security and medical HUDs 
The images now go away when the module isn't active
 2012-12-28 13:37:17 -08: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
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 01:07:36 +10:00
cib
438226c7c8 Fixed another graphical error with crew manifests. 2012-12-24 21:20:17 +01:00
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
cib
03b52e77e6 Fix two compile errors. 2012-12-24 21:07:04 +01:00
cib
9ccfe7e310 Crew manifest now shows whether a crew member is SSD. 2012-12-24 21:03:26 +01:00
cib
6da98a0c00 Everyone now has crew manifest, and it uses the good version on PDA's. 2012-12-24 20:50:20 +01:00
cib
55c1ec2300 Added a display of active players in a job for latejoin. 2012-12-24 20:32:28 +01:00
cib
c5fb6aaf60 Low blood levels now actually make your nutrition drop. 
This'll help make people low on blood eat something.
 2012-12-24 20:20:15 +01:00
cib
d8ab9906f7 Blood transfer rate was too fast, slowed it down. 2012-12-24 19:54:30 +01:00
cib
53e500188b Fixes to the IV drip. 2012-12-24 19:09:45 +01:00
cib
d581ebe767 IV drips now can take blood as well as give it. 
This makes blood donations much easier.
 2012-12-24 18:25:48 +01:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master 
Station-wide boom sound
 2012-12-23 06:00:41 -08:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm 
Removing a repeat if statement
 2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
0917269fe3 Merge pull request #2101 from Ravensdale/master 
Port: Ai cores
 2012-12-22 09:29:53 -08:00
Ravensdale
0ec910729c Porting of old AI cores. Introduces Triumverate, Serithi's TRIBUNAL sprite made public with permission. 2012-12-22 09:25:47 -08:00
cib
c354685bd7 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2012-12-22 17:56:02 +01:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates 
Crates
 2012-12-22 08:29:21 -08:00
Hawk-v3
5f77acd30e Merge pull request #2095 from comma/inspace 
Inspace
 2012-12-22 08:27:42 -08:00
Hawk-v3
9df91430fd Merge pull request #2097 from comma/surgery 
Surgery
 2012-12-22 08:27:18 -08:00
Hawk-v3
9e96fa8aca Merge pull request #2099 from Rowtree/master 
Camp Redacted - My map that cib wanted me to upload
 2012-12-22 08:25:15 -08:00
cib
767e9f33cf Reduced chemical metabolism and effect of chemicals. 
Most chemicals should now act just as strongly as before, but much more slowly.
 2012-12-22 02:51:40 +01:00
cib
5659e14668 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-22 02:25:46 +01:00
Chinsky
6635fc2a83 Merge branch 'master' into inspace 2012-12-21 01:26:02 +04:00
Chinsky
b3580e8265 Merge branch 'master' into surgery 2012-12-21 01:07:36 +04:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
Hawk-v3
346ffe618f Merge pull request #2087 from CIB/bugfix 
Fixed a bug with EMP's and robolimbs.
 2012-12-20 06:42:54 -08:00
Hawk-v3
a983b72f4d Merge pull request #2085 from GauHelldragon/master 
Various fixes
 2012-12-20 06:42:15 -08:00
cib
e0a500377c Fixes dropped cyborg limbs being human. 
Makes them cyborg parts instead.
 2012-12-19 23:30:58 +01:00
cib
2233d0dc8e Fixed a bug with EMP's and robolimbs. 
Light EMP's were much more likely to destroy robolimbs than heavy ones.
 2012-12-19 23:00:01 +01:00