Commit Graph

3335 Commits

Author SHA1 Message Date
Mloc
5f580c8417 Merge pull request #2855 from VitrescentTortoise/bleeding-edge-freeze
Resizes lobby manifest window & Cult chant edit
2013-05-26 14:57:33 -07:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master
Fix to event no-repetition code
2013-05-26 11:40:42 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2013-05-26 20:43:22 +02:00
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-26 05:02:07 +04:00
VitrescentTortoise
6f6731dab0 Resizes lobby manifest window 2013-05-25 16:53:07 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
Chinsky
e197799c46 Fixes #2830
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
2013-05-25 13:34:24 +04:00
Chinsky
30d93bd7d2 Fixed indentation derp.
I guess it was a dream when I saw it compiling.
2013-05-24 01:02:52 +04:00
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
Chinsky
629022f7b0 Fixes #2836
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
2013-05-23 15:06:37 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	baystation12.dme
2013-05-22 16:51:41 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
2013-05-22 12:55:15 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations.
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
2013-05-21 05:40:00 +04:00
Chinsky
7806915619 Added organ mutations.
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
2013-05-19 17:56:29 +04:00
cib
f5b0b52b6c Added stasis bag.
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00
cib
38cdb4d4f5 Most mobs can emote now.
Also added CSS to say, so that you can tell apart "say" and "me say"
2013-05-18 18:17:28 +02:00
cib
48b78ea758 Re-added latespawn.
Used in autotraitor and RP-revolution.
2013-05-18 11:06:19 +02: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
Spamcat
0fb651e873 Fixed glasses
Fixes #2742
2013-05-16 00:11:57 +04:00
cib
ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-14 01:29:45 +02:00
Chinsky
8af44c59f3 Merge pull request #2750 from Asanadas/master
Bugfix: Fix for bloody hands not occurring.
2013-05-13 10:56:30 -07:00
Asanadas
b81d0f1234 carnie umm, dunno if you guys have this bug: mobs not getting bloodyhands etc?
carnie	do a find-all for "//people with TK won't get smeared with blood" without the quotes
carnie	the > on that line should be a <=
carnie	erro's to blame
carnie	Mport provided the fix
Asanadas	if you say so, strange IRC man
2013-05-12 02:19:56 -04:00
SkyMarshal
697ab3dd7f Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card 2013-05-11 03:39:31 -07:00
Spamcat
bb962862ca Posibrains should work correctly in spiderbots.
Fixed the key transfer issue. (#2534)
2013-05-07 20:08:12 +04:00
Mloc-Argent
27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01: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
sick-trigger
c6323eced1 Better monky throwing fix
now, actually compiles! There seems to be a lot else wrong with monkey inventories but eh
2013-05-03 04:46:21 +10:00
Mloc
2989961542 Merge pull request #2729 from sick-trigger/master
Fix to let monkeys throw right
2013-05-02 05:14:37 -07:00
sick-trigger
d44986542f Monkeys can now throw properly 2013-05-01 21:56:53 +10:00
MisterBook
bfee1a8cd5 Alters the pAI and AI crew manifest verb to display the fancier version, a la the ID Computer's Crew Manifest call. Also replaced a dirty, dirty looping List write with the far more elegant if call to data_core.get_manifest() 2013-04-30 23:57:49 -05:00
MisterBook
73997d7bd4 Fixes Godmode for humans so that it truly is godmode. Good for bug checking. Atmos temperature difference will no longer directly apply fireloss, nor will being punched or shot in the guts damage organs. Can no longer be shocked. 2013-04-29 22:35:58 -05:00
DarkTechnomancer
99503c5542 Imported the option to start nearsighted and give glasses to those who do. 2013-04-28 22:45:15 -04:00
Spamcat
6bd34da085 Fixes #2689. 2013-04-27 13:54:13 +04:00
SkyMarshal
2de1809c70 Airflow now prevents doors being bumped open.
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
2013-04-18 09:57:28 -07:00
Jupotter
e51c3ce3f0 Fix a wrong null check in posibrain
A wrong nullcheck that prevent posibrain searching for a player
2013-04-18 09:56:53 -07:00
Jupotter
ca4eb6431b Add check forposibrain without brainmob
This should never happen, but check nonetheless.
2013-04-18 09:56:53 -07:00
jupotter
edba034413 Fix posibrain not turning off if no candidate
The reset proc was checking for the presence of a brainmob, while one
was created in the constructor. It should rather check the presence of a
key
2013-04-18 09:56:52 -07:00
SkyMarshal
b3f13d4dca Airflow now prevents doors being bumped open.
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
2013-04-17 01:36:05 -07:00
Jupotter
614c01f238 Fix a wrong null check in posibrain
A wrong nullcheck that prevent posibrain searching for a player
2013-04-13 13:16:28 +03:00
Jupotter
a8e1081d9d Add check forposibrain without brainmob
This should never happen, but check nonetheless.
2013-04-13 11:58:58 +03:00
jupotter
4836e9b057 Fix posibrain not turning off if no candidate
The reset proc was checking for the presence of a brainmob, while one
was created in the constructor. It should rather check the presence of a
key
2013-04-12 19:16:08 +02:00
jupotter
12c7cfc88a Allow sec hud to add comment to sec record
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the security record view from the
Security Hud
This list all the comments as on the security record computer
2013-04-08 14:13:58 +02:00
jupotter
4b9d14b564 Allow medical hud to add comment to medical record
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the medical record view from the
Medical Hud
This list all the comments as on the medical record computer
2013-04-08 14:12:57 +02:00
jupotter
bd52b3de32 Fix medical status change text from medical hud 2013-04-08 14:07:13 +02:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
93e37a6a0c Fix for mouse emotes, courtesy of nan0desu.
#2613
2013-04-02 23:25:34 +04:00