cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,889 Commits 6 Branches 0 Tags
c175833b9cb725493b25bc62ad4da99b54a58497
Commit Graph

4612 Commits

Author SHA1 Message Date
Chinsky
c175833b9c Started working on making paper use HTML instead of only BBCode again. 
Whitelisting system for tags.
Blacklist for words like 'java' and names of even triggers.
Might move to whitelist for those too, on Mini's suggestion.
 2013-01-15 07:17:21 +04:00
Chinsky
f22749df04 Merge branch 'adminstuff' 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2013-01-12 23:48:03 +04:00
Chinsky
18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky
dc2f77ddd0 Merge branch 'cult' 2013-01-12 22:30:56 +04:00
Chinsky
e55e8fc3a3 Added verb for admins to create additional job slot. 2013-01-11 04:22:05 +04:00
Chinsky
4f173c52a8 Good God, cult code is atrocious.... 
For now made all words into one list, instead of separate vars for each.
Brought back awesome Urist runes. Down with crayon doodles!

Need to look into making rune NOT check what rune it is EVERY TIME it is activated... making subclasses or some shit like that.
The more I stare in that code the louder screams in my head, maybe that's intended?
 2013-01-11 02:01:23 +04:00
Chinsky
c15b5aee0f Changed way dripping blood works a little. 
Now there could be 5 drips on a tile.
Drip #6 makes it into blood puddle.
Now if you bleed out you won't lie in 3 drops of blood, bubt in proper puddle
 2013-01-10 14:23:01 +04:00
Chinsky
08b52b0f04 Added alternative uniform for Security officers and Security armor vest. 2013-01-10 14:21:22 +04:00
Cael_Aislinn
6aa245f716 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/gameticker.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-08 23:08:52 +10:00
Cael_Aislinn
2ad36df02a fixed up a bunch of miscellaneous derps that broke compiling (several unticked files, as well as one mistakenly removed file) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-08 23:03:48 +10:00
Chinsky
7f1e7ca954 Moved most admin verbs from admin_verbs_default to admin_verbs_admin. 
Reason is to make moderators possible without Game Masters losing basic admin verbs.
Now default admin verbs only have bare bone functionality, and each next permission adds more.
 2013-01-07 20:41:45 +04:00
Cael_Aislinn
7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 22:26:24 +10:00
Cael_Aislinn
986652ae3e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-01-07 22:17:07 +10:00
Cael_Aislinn
3186ff344e added dwarf fortress music for the title screen and mining asteroid 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 22:13:24 +10:00
Cael_Aislinn
e263f273f1 cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 21:39:34 +10:00
Zuhayr
0c3f3e84ef Whoops, forgot to add the designs.dm file. 2013-01-07 14:51:06 -08:00
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
Cael_Aislinn
990090326d compile fixes and cleanup 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 02:36:52 +10:00
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 00:23:22 +10: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
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
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04: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
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
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
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
Hawk-v3
c612dd60da Merge pull request #2114 from GauHelldragon/master 
Robot HUD fixes
 2012-12-30 08:54:45 -08: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
03b52e77e6 Fix two compile errors. 2012-12-24 21:07:04 +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
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
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