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

564 Commits

Author SHA1 Message Date
Spamcat
def7d83e0f Re-added alt satchels. 2012-10-21 23:21:40 +04:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:25:04 +10:00
Cael_Aislinn
3fe88c4fef mergefixes, misc 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:11:01 +10:00
cib
01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
Chinsky
92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
 2012-10-18 09:13:24 +04:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
cib
463178213c You can now pick opposite gender hairstyles. 2012-10-17 18:53:00 +02:00
Mloc
351a233f5f Arrivals runtime fix, thanks to Head! 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:07:19 +01:00
Chinsky
44934ef622 Removed my highly informative and professional debug print. 2012-10-17 14:33:53 +04:00
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
Chinsky
357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
Chinsky
f0c4e3e965 Ported some of hairstyles. 2012-10-17 04:50:49 +04:00
Chinsky
fbc26fde61 Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though. 2012-10-17 03:24:39 +04:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 23:17:18 +10:00
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 13:59:50 +10:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master 
Fixed flavor text
 2012-10-13 20:10:18 -07:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master 
Fixed Organspam (Maybe)
 2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
baloh.matevz
96b53e1189 - Added numeric value polls. These allow multiple options to be present in each poll, each option has a drop-down list that goes from a low value (-3 in screenshot) to a high value (3 in screenshot), both of these can be set per-option. Along with text descriptors for the lowest value option, middle option and highest value option (In the screenshot 'Worst', 'no change' and 'Best') 
Example screenshot (if you ignore the poll text):
http://www.kamletos.si/numval%20polls.PNG

Also note that the screenshot above only has one option (or question). It can have an unlimited number.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4848 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-12 18:37:36 +00:00
Cael_Aislinn
6d4e17ac32 fix for alien species limiter bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 23:36:10 +10:00
Cael_Aislinn
79ad144e91 fix^2 for mods and admins not being applied correctly, along with the admin/player panel not showing up 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 16:39:26 +10:00
Cael_Aislinn
fed6625e07 fix for moderators not being loaded correctly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 13:44:23 +10:00
Cael_Aislinn
6365459bde additional mergefixes, including tg map updates 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-09 23:22:51 +10:00
Cael_Aislinn
c6916f678d updated changelog, added new TG notif type to show tg ports 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-09 23:15:28 +10:00
Cael_Aislinn
cccff0881f Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-09 23:07:41 +10:00
baloh.matevz
2bf2f7bef8 - Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list. 
- Added simple bump teleporters.
- Updated 3.0.0 some more, including the draft of a new Centcom.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4826 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-07 21:08:23 +00:00
johnsonmt88@gmail.com
4979a98e77 Fixed a typo when trying to latejoin before a round starts or after it finishes. 
- A '/' should have been a '\'

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4824 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-07 18:42:51 +00:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
 2012-10-05 22:21:26 +10:00
elly1989@rocketmail.com
eb10f04ea3 obj/hud is now datum/hud. There was no need for it to be an object. 
Moved some of the static overlays such as the dither effects, druggy effect and blurry-eyes into datum/global_hud. Meaning that only one object is instanced per server rather than per mob. It reduces on code.
Commented out a green and red overlay which aren't used, which were being instanced for every mob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4767 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-28 23:02:11 +00:00
Cael_Aislinn
a7bd4eeb42 some minor tweaks to character preview to be in line with tg 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 20:52:51 +10:00
Cael_Aislinn
7ab7b989f2 added searif's new skrell hairstyles (missing lying icon states) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 19:01:47 +10:00
Cael_Aislinn
b618eeef82 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 18:49:18 +10:00
Cael_Aislinn
a668a45f8b fix for alien whitelisting 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 18:08:34 +10:00
elly1989@rocketmail.com
9813d2bbec var/fakekey; var/ooccolor; var/sound_adminhelp moved from /client to /datum/admins. These settings will now persist through a round even through logouts. 
var/stealth merged into var/fakekey as it was superfluous.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4753 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-25 13:09:43 +00:00
petethegoat@gmail.com
9a376f2ea0 Fix for the char setup overlays. 
As the mouth overlay is only used for lipstick now, we can ignore it completely for the preview.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4744 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-23 22:27:48 +00:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01:00
Cael_Aislinn
e645d78f11 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.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/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-22 21:29:04 +10:00
giacomand@gmail.com
384b2717b0 -Added a "landmarks_list"; the game will now check for landmarks in the list instead of the world. 
-Did some optimizing to AI freelook.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4670 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-09 22:27:06 +00:00
Cael_Aislinn
6d6c328c03 limits alien players in any round to 20% of total alien/human players (ignores ai/cyborgs) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-08 15:30:14 +10:00
Cael_Aislinn
f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649) 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-08 14:22:44 +10:00
johnsonmt88@gmail.com
7514e800d5 Must have had some kind of hiccup, the 'return' didn't get committed? 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4647 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-07 22:15:15 +00:00
johnsonmt88@gmail.com
438d55ed44 The late-join button now requires the ticker's state to be GAME_STATE_PLAYING. 
Meaning that you can not late-join before the round actually starts or after the nuke up/malf ending cinematic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4646 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-07 22:04:55 +00:00
Erthilo
41e19a6e62 Merged arrivals announcement computer. 2012-08-29 22:36:36 +01:00
Cael_Aislinn
62b2f41921 taj can't wear gloves or shoes comfortably, have a chance to break them/hurt themself when they try to put them on 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-28 21:34:20 +10:00
Cael_Aislinn
eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-28 19:57:11 +10:00