cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

806 Commits

Author SHA1 Message Date
Cael_Aislinn
6437e1d84e changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:40:38 +10:00
Cael_Aislinn
0173f745e9 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:41:16 +10:00
Cael_Aislinn
ca2035da1f changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:46:30 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:23:16 +10:00
Cael_Aislinn
1fa38136c0 changelog updates, cleaned up formatting on the most recent changelog entries 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:16:56 +10:00
cib
13f65265fe Added changelog. 2013-03-05 04:30:21 +01:00
Gamerofthegame
e8e636121e Changelog 2013-02-26 22:30:53 -05:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 03:02:24 +10:00
Cael_Aislinn
3fcab3bf19 more changelog, boosted max shield charge rate 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:21:32 +10:00
Cael_Aislinn
13a4e0be61 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:01:59 +10:00
Cael_Aislinn
9992b7bd44 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 22:25:22 +10:00
Chinsky
29b1ef1c63 Derp, forgot main part of explosive implant EMP code and changelog. 2013-02-23 00:41:20 +04:00
Cael_Aislinn
43e58aacbb new unathi hair styles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:46:33 +10:00
Cael_Aislinn
3144de6a47 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:08:29 +10:00
Chinsky
6015df7178 Tweaks to side effects. 
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
 2013-02-20 20:00:01 +04:00
Chinsky
334da25223 Added surgery to put things in people. 2013-02-18 13:22:23 +04:00
Cael_Aislinn
844d9e7e89 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 01:27:54 +10:00
cib
e14855be35 Updated changelog. 2013-02-14 17:20:04 +01:00
Erthilo
792b1f5af7 Another changelog update. 2013-02-13 18:01:49 +00:00
Erthilo
bda06da3c4 Changelog update. 2013-02-13 17:13:25 +00:00
Erthilo
dc6578563f Changelog update 2013-02-13 11:03:00 +00:00
Cael_Aislinn
06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:45:13 +10:00
Cael_Aislinn
b310da9bb9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	html/changelog.html
	icons/mob/human_face.dmi

also a sneaky issue resolution caused in spiky taj hair

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:25:45 +10:00
cib
49e887c5d1 Changelog typo fix 2013-01-31 19:38:27 +01:00
cib
4a39d9b53b Fixes for gamebreaking metabolism rates 
- A single chili doesn't kill anymore
- Chloral hydrate no longer kills in amounts of 2 units
 2013-01-31 18:04:51 +01:00
Chinsky
bfb1df5f17 Derps fixed 2013-01-26 09:51:44 +04:00
Chinsky
7a66e7e524 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2013-01-22 23:46:42 +04:00
Chinsky
7310e4bd06 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
 2013-01-22 20:07:10 +04:00
Chinsky
9792a1c983 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
 2013-01-22 20:05:45 +04:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:02:27 +10:00
Cael_Aislinn
82ebb7ab5a updated changelog 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:50:04 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:03 +10:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:05:17 +10:00
GauHelldragon
280dbbd9b1 updated changelog 2013-01-15 14:27:12 -08:00
Mloc
83d2109b08 Merge pull request #2188 from CIB/BEF-premerge 
Updated changelog.
 2013-01-15 14:05:56 -08:00
cib
e8a4dd33c5 Updated changelog. 2013-01-15 23:03:06 +01:00
GauHelldragon
85c9431aa4 Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-01-15 13:59:10 -08:00
Mloc
cad798adad Merge pull request #2187 from CIB/BEF-premerge 
Merge pre-tg-merge BEF
 2013-01-15 13:29:59 -08:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 22:14:46 +10:00
Cael_Aislinn
ee9b0eeeae Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2013-01-14 21:59:30 +10:00
GauHelldragon
45f7783b6d Changelog! 
Updated changelog with my additions
 2013-01-13 00:19:41 -08:00
Chinsky
047c8f399c Updated changelog 2013-01-13 12:16:41 +04:00
GauHelldragon
562e3c37c3 Changelog update 
Forgot to do this when i added the servicebot stuff.
 2013-01-13 00:13:23 -08:00
Cael_Aislinn
98581483b2 updated changelog 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 22:28:41 +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
Chinsky
85e2043385 Updated changelog 2013-01-07 03:09:33 +04: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
87d6ad1b7a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-06 12:13:28 +04:00
Zuhayr
6751c1a6be Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 03:12:48 -08:00
Cael_Aislinn
88370e9fd6 modified changelog header to have a link to BEF server 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-01 16:30:58 +10:00