7e1e1872b2
Readded robolimbs and amputated limbs drawing properly.
...
Now character gets proper robo and amputated limbs on spawn.
Readded checks for amputated hands.
2012-10-30 07:59:54 +04:00
6f1852449d
Ported custom items system.
2012-10-30 02:27:51 +04:00
14fa60a125
- You can now set your character's age up to 85 (used to be 45) in the character setup menu.
...
- Added a few helper procs that change someone's skin tone to a descriptive word and someone's age to a descriptive word. This will be used in a human examine verb update.
- Completely remapped Medbay for 3.0.0.
Discussion thread for medbay remap:
http://www.nanotrasen.com/phpBB3/viewtopic.php?f=15&t=10677
Screenshots of medbay remap:
http://www.kamletos.si/medbay%203.0.0%206.png (normal lighting)
http://www.kamletos.si/medbay%203.0.0%206%20nodark.png (no darkness)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4974 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 16:10:34 +00:00
4d9876fd65
Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
...
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.
Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
665c840da3
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-26 23:57:05 +04:00
2063c3715d
Added Flashkirby's new hair styles- http://baystation12.net/forums/viewtopic.php?f=44&t=5395 .
...
Updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4957 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:11:13 +00:00
b1fdee2e32
Changed some global_list stuff:
...
>tried to make the comments less confusing.
>Removed the procs for rebuilding the lists (they weren't meant to be used and half were broken anyway).
>added a directory. It maps ckey to client like so directory[ckey] = client. It could be used for PMs, banning, and various other admin tools rather than using \ref[]
>var/list/admins is now a list of clients whom are admins.
>var/list/admin_datums is what var/list/admins used to be. A map from ckey -> admin datum
Most of this is so I can add modular admin ranks in a non-horrendous way and fix some existing issues.
>var/list/client_list is now var/list/clients (laziness sorry)
>removed some needless loops and stuff.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4951 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 20:11:39 +00:00
5bee6e1d24
ghosts have universal talk again
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-24 23:45:57 +10:00
7183a7c3d3
Merge https://github.com/Baystation12/Baystation12
2012-10-23 17:56:00 +04:00
2cea1ecf7e
Merge https://github.com/Baystation12/Baystation12
2012-10-22 17:55:05 +04:00
def7d83e0f
Re-added alt satchels.
2012-10-21 23:21:40 +04:00
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
3fe88c4fef
mergefixes, misc
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-21 00:11:01 +10:00
01ba3871ca
Fixed the bug where 'Show Own Skills' wouldn't work.
2012-10-18 15:33:46 +02:00
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
a1aa3ddecf
Ported limb selection.
2012-10-17 20:08:34 +02:00
463178213c
You can now pick opposite gender hairstyles.
2012-10-17 18:53:00 +02:00
351a233f5f
Arrivals runtime fix, thanks to Head!
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-10-17 16:07:19 +01:00
44934ef622
Removed my highly informative and professional debug print.
2012-10-17 14:33:53 +04:00
45e40c09c0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-17 14:12:41 +04:00
357f42028e
Forgot one hairstyle.
2012-10-17 13:50:47 +04:00
f0c4e3e965
Ported some of hairstyles.
2012-10-17 04:50:49 +04:00
fbc26fde61
Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though.
2012-10-17 03:24:39 +04:00
7fccadfc89
Ported AutoTraitor.
2012-10-16 18:44:53 +02:00
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
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
e00a696a40
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-10-15 20:57:54 +10:00
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
10f32d1351
Merge pull request #1760 from DarkTechnomancer/master
...
Fixed flavor text
2012-10-13 20:10:18 -07:00
4bf6833a62
Fixed flavor text
2012-10-13 19:27:43 -04:00
c04c26fa29
Merge pull request #1759 from headswe/master
...
Fixed Organspam (Maybe)
2012-10-13 15:44:42 -07:00
085d357b4b
Hopefully fixed organ spam.
2012-10-14 00:43:23 +02:00
9ae4bbfdf8
Fixes the say_quote runtime.
2012-10-12 16:15:34 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a668a45f8b
fix for alien whitelisting
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-26 18:08:34 +10:00
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
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
Chinsky
