ZomgPonies
ed8714550c
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master
...
Conflicts:
config/example/config.txt
config/example/motd.txt
config/example/rules.html
2013-09-05 13:29:34 -04:00
Erthilo
7a319904e4
Reverts gender checks as it was breaking with NEUTER and breaking facial hair.
2013-08-27 22:51:24 +01:00
Segrain
e85ddd3b9a
Fix for unisex hairstyles.
2013-08-25 09:27:05 +03:00
ZomgPonies
91bc429721
Merge branch 'pr/4'
...
Conflicts:
.gitignore
2013-08-24 17:25:58 -04:00
Erthilo
d7fc84b42b
Better gender checks.
2013-08-21 09:59:07 +01:00
Erthilo
de6eb16e1a
Fixes being able to have alien species hair on humans or other species.
2013-08-20 10:37:05 +01:00
ZomgPonies
ebfa0a0fd2
Merge branch 'pr/2'
...
Conflicts:
baystation12.dme
config/example/dbconfig.txt
2013-08-17 15:22:49 -04:00
Zuhayr
9e58d93fd6
Removing snowflake checks for Soghun.
2013-08-16 01:01:12 -07:00
Zuhayr
f6a562e8ed
Couple of typos.
2013-08-14 09:47:52 -07:00
Zuhayr
45a26fcad9
Removed a debug string.
2013-08-14 02:19:36 -07:00
Zuhayr
e10a433800
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:18 -07:00
ZomgPonies
2adc744e65
Merge pull request #1 from Baystation12/master
...
More patches from BS12:master
2013-08-13 13:39:15 -07:00
Zuhayr
254cef453a
Added a preferences switch for diona.
2013-08-13 14:16:07 -07:00
Zuhayr
82a4dedf5d
Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD.
2013-08-12 21:17:38 -07:00
ZomgPonies
d752da826e
Karma System, 1st iteration
2013-08-12 02:04:05 -04:00
Zuhayr
bc4ac1d4ee
Language choice changes.
2013-08-10 21:00:15 -07:00
Zuhayr
b5d89b8929
Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn.
2013-08-07 01:16:38 -07:00
Kilakk
d7d84ff515
Added a deadchat toggle for all players.
...
* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat
2013-07-27 22:54:30 -04:00
Zuhayr
168e334abd
Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values.
2013-07-28 06:05:22 -07:00
Peter Wall
5e91c569cc
Made always random name respect gender
2013-07-27 10:09:58 +02:00
Jamini
920b855f6c
Added employment records.
...
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-07-24 22:23:50 -04:00
Mloc-Argent
c6a9bbc9fc
Properly reverts Kida. (what a mess)
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-12 12:48:07 +01:00
Mloc-Argent
cf53dd7a10
Revert "Adds in the Kida"
...
This reverts commit a2fddc0fc1
2013-07-12 12:22:35 +01:00
comma
f1cfb96dab
Fixes #3225 . Adds separate toggle for LOOC.
...
Fixes #3285 . Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
2013-07-10 22:39:27 +04:00
Whitellama
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -07:00
ZekeSulastin
3c6c9ed304
Secondary language is saved in the char saves
...
Also increments the max save version; previous saves are rendered
compatible via sanity check assuming no secondary language.
2013-06-29 17:32:48 -04:00
ZekeSulastin
9a8b9bcc60
Added secondary language to char setup
...
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
2013-06-29 17:31:21 -04:00
Whitellama
90eaca1e53
WIP Ninja GM junk
2013-06-26 16:30:24 -07:00
Zuhayr
b41b1fc2f3
Armalis simple_animal/sprite.
2013-06-15 04:09:49 -07:00
NicholasDV
a2fddc0fc1
Adds in the Kida
...
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
Kilakk
bde37882ce
Fixed a small spelling error in job prefs
2013-06-11 21:36:40 -04:00
Kilakk
6c8423aed0
Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze
2013-06-11 16:25:42 -04:00
cib
13b16bcd69
Added extra message when downloading external resources.
2013-06-11 21:28:59 +02:00
cib
4e0c68b88a
Added a configuration option that allows putting the .rsc on external servers.
2013-06-11 21:28:59 +02:00
Kilakk
333163dc01
Reconfigured the job prefs panel to look nicer
...
Thanks Deccy for pointing out a one pixel difference
2013-06-10 21:45:50 -04:00
Zuhayr
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
VitrescentTortoise
aa68ac375a
Edited changelog, made small edit.
2013-05-26 19:00:55 -07:00
VitrescentTortoise
d0d51222e1
Allows players to return to lobby if job prefernces unavailable
2013-05-26 18:18:41 -07:00
Mloc
5faabba7fb
Merge branch 'master' into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
Signed-off-by: Mloc <colmohici@gmail.com >
2013-05-16 12:21:55 +01:00
Mloc
e0f22c9931
Turn off control_freak for profiling and stuff.
2013-05-15 22:52:25 +02:00
Spamcat
0fb651e873
Fixed glasses
...
Fixes #2742
2013-05-16 00:11:57 +04:00
Cael_Aislinn
da9ad69983
made hyperspectral analysis images into a client-side resource
2013-05-14 13:07:11 +10:00
Ravensdale
754057cd09
hopefully disables glasses, unable to replicate bug.
2013-05-10 17:39:59 -07:00
Spamcat
02fd487008
Blood type now saves in savefile.
...
fixes #2738
2013-05-04 13:22:21 +04:00
Spamcat
f7f6c682cf
Made nearsightedness not consume a fuckton of memory.
...
Also it now adds glasses on preview pic.
2013-05-03 23:58:56 +04:00
DarkTechnomancer
99503c5542
Imported the option to start nearsighted and give glasses to those who do.
2013-04-28 22:45:15 -04:00
Asanadas
f2ce063eda
Fixes a slip-up division thing.
2013-04-24 20:01:49 -04:00
Asanadas
ff229d5780
This 10x increases the size of admin-uploadable sound .ogg files and MIDI (10MB Midi, a scary thought). Should be big enough for any space assholes. Players can always opt out of uploaded music being downloaded and played with their "Hear/Silence-Midis" verb.
2013-04-24 17:55:14 -04:00
Zuhayr
d261e3836f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-02-20 12:36:22 -08:00
Zuhayr
1fe4cbb619
Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.
2013-02-20 00:24:26 -08:00
