cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,427 Commits 5 Branches 0 Tags
5b13445e9540532000aed2bc925014d3173fce35
Commit Graph

5297 Commits

Author SHA1 Message Date
Cael Aislinn
57703df2f9 Merge pull request #2261 from comma/master 
Fixes
 2013-02-06 01:02:27 -08:00
Chinsky
f9894599cf Readded Show Skills verb 2013-02-06 07:23:27 +04:00
Chinsky
558a479954 Fix for Command Report runtime. 2013-02-06 07:05:41 +04:00
Chinsky
51b4005442 Fixed emitter logging only workign for turning it off. 2013-02-06 06:52:36 +04:00
Chinsky
f4b08b0923 Made adminlog messages not visible to mods again. 
Return of attacklog spam (now toggleable)
 2013-02-06 06:14:31 +04:00
Zuhayr
027955d3d2 Fixed invisible Ripley bug, added line of fluff to posibrain join message, reduced posibrain requirements. 2013-02-06 04:07:32 -08:00
Chinsky
db5b00cd61 Quick fix for mods not being able to access CA from some places 2013-02-05 17:17:39 +04:00
Chinsky
e68dcce602 Msay and adminhelps now go to admins and mods. 2013-02-05 16:44:15 +04:00
Chinsky
7528570b1b Added verb to toggle deadchat to everyone who can hear it. 
Mods now can ghostjump again.
 2013-02-05 15:51:07 +04:00
Cael_Aislinn
651fa7a9f0 restructured tools, restructured/added archaeo finds, restructured how finds spawn in the asteroid, tweaked some mining stuff 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-04 23:40:53 +10:00
Cael_Aislinn
0efb0311e3 removed misc file, added some extra sprites, added/tweaked list helpers 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-04 23:37:50 +10:00
Chinsky
5a23ec6485 Fixed asay being visible to moderators. 2013-02-03 00:50:39 +04:00
Chinsky
f4469083b2 Made permission checks for some verbs more TG-compliant. 
Fixed Edit Appearance verb.
Removed DB verb since we are not using SQL and it'll only confuse admins.
 2013-02-03 00:10:29 +04:00
Chinsky
e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm
 2013-02-02 23:10:12 +04:00
Chinsky
f553a66553 Fixed two hairstyles having same name. 2013-02-02 22:16:38 +04:00
Chinsky
c4997a34f1 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2013-02-02 20:00:10 +04:00
Cael_Aislinn
3f62e2a938 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/xenoarchaeology/artifact_effect.dm
	code/modules/research/xenoarchaeology/finds.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-02 17:05:27 +10:00
Chinsky
bc340028be Made atmos suit fire-resistant again and handled slowdown changes in a less clutery way. 2013-02-01 20:30:58 +04: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
Cael_Aislinn
2d15506667 removed extraneous rig slowdowns 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 22:46:24 +10:00
Cael_Aislinn
6743f09ef2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-01 13:57:27 +10:00
Whitellama
5d090b0611 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest 
Conflicts:
	code/WorkInProgress/Cib/amorph/amorph_hud.dm
	code/game/objects/structures/window.dm
	code/modules/mob/living/blob/blob.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/screen.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/tgstation.2.0.9.1.dmm
 2013-01-31 14:26:58 -08:00
cib
e9d7b5ce0d Missing part of tajaran ear commit. 2013-01-31 20:04:22 +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
3e153c074c Replaced courtroom with meeting room. 2013-01-30 19:15:49 +04:00
Chinsky
24cf3c2dd0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/datums/supplypacks.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	icons/mob/suit.dmi
	icons/obj/drinks.dmi
 2013-01-30 16:39:00 +04:00
Cael_Aislinn
01eeef048f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-30 13:13:37 +10:00
Chinsky
566ef61c23 Made blood type selectable in preferences again. 2013-01-30 01:31:37 +04:00
cib
f8ca13262c Fix issue #2193 2013-01-29 18:07:18 +01:00
RavingManiac
b121235cf8 Pepper spray blindness and eye blurriness durations quintupled. Condensed capsaicin recipe added (capsaicin + plasma catalyst). 2013-01-29 18:12:42 +08:00
Whitellama
10127c4f34 Fixed gun aiming HUD buttons, other WIP junk 2013-01-27 17:34:12 -08:00
Chinsky
5185dd988e Surgery runtime checks. 2013-01-28 01:51:42 +04:00
Chinsky
0c260c2c17 Added rejuv verb and setting OOC event info. 2013-01-28 01:28:30 +04:00
Chinsky
39a6b54a5a Added admins some verbs that flithy mods were hogging. 2013-01-28 01:25:52 +04:00
Cael_Aislinn
3c06edc689 resolved lying sprite issue for atmos hardsuits, hair being hidden behind atmos hardsuit helmets, normalised a bunch of values across hardsuits (slowdown, mainly) 2013-01-25 11:48:17 +10:00
Chinsky
dda55a02bc Blood now goes to vessels again. 2013-01-24 17:14:36 +04:00
Cael_Aislinn
e7c10c44cd made delay round end work after restart timer has started, made delay verb also delay round end 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-24 15:38:23 +10:00
Chinsky
7f5e8bf595 Return of Moderator III: This is Getting Old. 
Fixed mods back in, should have all powers they did.
Mod panel is MIA< let them use same admins use, can't do shit without having rights anyway.
 2013-01-23 06:27:31 +04:00
Asanadas
84ebfea65a ' 2013-01-22 15:25:37 -05: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
79b17d0c1d Furry delight, more facial hairs and hairstyles for space cats. 
Sprites provided by Mister_Fox
 2013-01-22 21:52:40 +04:00
Chinsky
39b9e636d3 Now completely merged.. damn git. 2013-01-22 20:58:54 +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
7d0fb3d51a compile / dme fixes, removed unused file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:11:19 +10: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
Jim "Apples"
090495f386 Merge pull request #2205 from caelaislinn/bleeding-edge-freeze 
Miscellaneous (see desc)
 2013-01-22 06:55:44 -08:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:48:07 +10:00
Cael_Aislinn
fb2b2a1d52 various compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:43:54 +10:00