cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,699 Commits 10 Branches 0 Tags
f7f014df6fd01735cbc701091bdeb8c47b4ab165
Commit Graph

8239 Commits

Author SHA1 Message Date
Zuhayr
f7f014df6f Added binary talk for positronic brains, fixed mech destruction error, added positronic brain design to protolathe. 2013-01-07 14:47:29 -08:00
Zuhayr
45f0c2823d Removed an errant 'else' and included the baystation12.dme. 2013-01-06 15:41:02 -08:00
Hawk-v3
ac229bb38e Merge pull request #2148 from Zuhayr/master 
Posibrain fix, seedbag fix.
 2013-01-05 17:18:26 -08:00
Zuhayr
981e7ff3d7 Description fix for posibrains, reset timer on posibrain search, minor fix for Gau's seedbag. 2013-01-06 12:20:51 -08:00
Hawk-v3
62bd0e8a68 Merge pull request #2146 from comma/master 
Violence and carnage
 2013-01-05 15:58:45 -08:00
Hawk-v3
d1fbc74a11 Merge pull request #2145 from GauHelldragon/bleeding 
Seedbags!
 2013-01-05 15:56:34 -08:00
Zuhayr
491821f8f7 Forgot the actual positronic brain file. Yay. 2013-01-06 10:53:29 -08:00
Zuhayr
4f93d392f4 Added sprites and basic code for positronic brains. 2013-01-06 04:04:25 -08:00
Zuhayr
6751c1a6be Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 03:12:48 -08:00
SkyMarshal
93476a2c16 Finishing touches on Air Alarms, Firedoors, and Central Atmos Control 2013-01-04 22:00:56 -07:00
SkyMarshal
fb6df3a698 Made air alarms non-retarded again. If you readd the Central Atmos Control thing again, it should work instantly. Also made firedoors deploy during atmos alarms, and made it so people need to actually answer a dialog box to open if they are powered and the area is locked down. 2013-01-04 22:00:47 -07:00
Chinsky
5805cf5ba1 Now it is possible to disfigure faces again, if head has more thn 40 damage. Burns work better for that. 2013-01-04 20:43:21 +04:00
Chinsky
859ae76d8d Added a chance for stool breaking over someone, stunning them and dealing more damage. 2013-01-04 16:24:35 +04:00
Chinsky
bc17911eac Added ability to slam people against the tables 2013-01-04 09:06:33 +04:00
Chinsky
1bb6a7bdb1 Added ability to bash people against the windows 2013-01-04 08:36:41 +04:00
Chinsky
76efcdb254 Added ability to pick up stools. 2013-01-04 07:42:44 +04:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
Chinsky
6e408cc8ca Removed some debug print to diary 2013-01-04 05:24:30 +04:00
GauHelldragon
037f86aaf0 This belongs in bleeding edge, not master! 2013-01-03 16:12:17 -08:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer 
You can no longer load your robot modules into these. Fixes #2138
 2013-01-03 16:08:46 -08:00
GauHelldragon
673a233268 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-03 15:51:06 -08:00
Chinsky
f8ce54c87f Return of Moderator II 
Added MOD permissions that cover moderator verbs without admin ones.
Ported our notes system.

Fixed OOC not displayed for peasants.
 2013-01-04 03:02:08 +04:00
Cael_Aislinn
e43e96d296 removed exploit where syndicate ids could make players untargettable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-03 14:38:59 +10:00
Chinsky
16e6e64560 Added holosigns, specifically surgery one. 
Pretty much a floating sign, toggled by a switch.
 2013-01-03 08:21:10 +04:00
Chinsky
88baf11731 Added missing contraband.dm file 2013-01-03 08:20:08 +04:00
Chinsky
cb5e61280b Fixed contraband and surgery crate runtimes. 2013-01-03 04:35:33 +04:00
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
GauHelldragon
3d12d0b234 Seedbags now put their ouputing seeds into your hand 
Added "Unload All" button to interface
 2013-01-02 11:27:51 -08: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
GauHelldragon
b1dd8f50f3 Seedbags! 
Added seedbags to hydroponic lockers and the nutri-vendor
They function similarly to plantbags, but obviously hold seeds. The interface for taking seeds out is identical to the smartfridge, however.
 2013-01-02 02:54:48 -08:00
GauHelldragon
e8f052d0c9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-01 22:26:45 -08: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