cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,857 Commits 8 Branches 0 Tags
2ad36df02a330e24f1a10f9997ac96809baab846
Commit Graph

8373 Commits

Author SHA1 Message Date
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
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
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
Hawk-v3
be47b96d63 Merge pull request #2150 from Ravensdale/master 
4-way manifolds, manual transfer valves and pipe caps!
 2013-01-06 21:13:30 -08:00
Hawk-v3
19b63ade1b Merge pull request #2151 from comma/master 
Implants
 2013-01-06 21:09:56 -08: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
Chinsky
9b4e923a30 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-07 02:31:45 +04:00
Chinsky
97de14114e Fixed advanced scanners to detect implants 2013-01-07 02:31:19 +04: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
Chinsky
7abec8d3bc Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 12:15:30 +04:00
Chinsky
87d6ad1b7a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-06 12:13:28 +04:00
Chinsky
5f0c39f1cf Added implant removal surgery. 
If you fail the step, has small chance of activating implant.
Gives you a sound and ~15 ticks to run away like hell.

Changes I did to other parts to make this possible:
-Implants are now organ-based, not mob-based
-Part of implant working code is moved to appropriate activate() procs
 2013-01-06 11:25:53 +04:00
Ravensdale
4dcf0f0c76 alright, 4-way manifolds, manual t-valves, pipe caps. 2013-01-05 21:39:39 -08:00
Ravensdale
3c9d5b161c Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-05 20:50:47 -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
Chinsky
26efcd94cb Readded implants to uplink (Compressed matter and Explosive) 2013-01-06 02:25:34 +04:00
Chinsky
7658410ea0 Fixes Game Master's OOC messages being doubled. 2013-01-06 01:02:14 +04: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
Ravensdale
d01770ad56 Bringing in 4-way manifolds, pipe caps, manual tvalves. 2013-01-03 05:47:07 -08: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