Commit Graph

10738 Commits

Author SHA1 Message Date
Zuhayr
8d01974057 Small language fixes, oops. 2013-08-25 02:13:23 -07:00
Zuhayr
64e705ba33 Adding radiation feeding to dionaea, tweaking species values, adding shock to lighting checks, adding light checks to diona nymphs. 2013-08-25 02:08:09 -07:00
Zuhayr
b0d4b1967b Uncommented languages for experimental purposes. 2013-08-25 01:05:24 -07:00
Segrain
e85ddd3b9a Fix for unisex hairstyles. 2013-08-25 09:27:05 +03:00
Zuhayr
a5f79057d1 Merge pull request #3585 from Segrain/master
Hairfix.
2013-08-24 22:50:36 -07:00
Zuhayr
97b0272e80 Added stealth engines to the Vox ship to allow the Exodus to hear that they are coming. 2013-08-24 21:24:41 -07:00
Kilakk
86d709e150 Fixed medical HUDs not being able to set SSD status correctly 2013-08-24 23:52:00 -04:00
Zuhayr
591cde1ccb Emags now have a ten-use limit. 2013-08-24 19:25:05 -07:00
Zuhayr
25685c1492 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-24 18:02:11 -07:00
Zuhayr
d568023d45 Increased cooldown on vox shuttle engines to two minutes. 2013-08-24 15:42:53 -07:00
Zuhayr
d875d3e2f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-24 15:04:38 -07:00
Zuhayr
2216aed7ce Merge pull request #3582 from alex-gh/add_rezadone
Ported Rezadone (Heals clone damage without cryo) from tg-station
2013-08-24 09:56:26 -07:00
Alex
01ac4be991 Ported Rezadone (Heals clone damage without cryo) from tg-station 2013-08-24 18:35:10 +02:00
Segrain
f1f6c07ded Same mapfix, part 2. Also, minor update. 2013-08-24 09:35:14 +03:00
Zuhayr
d647147717 Merge pull request #3575 from DJSnapshot/master
game modes other than extended will not be announced (Also, pull request from master)
2013-08-23 21:43:58 -07:00
meyar
c0d264fed7 Fixes fire lockers. They actually start with stuff in them. 2013-08-23 20:39:08 -04:00
meyar
48dafb1904 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-23 20:02:16 -04:00
Kilakk
e634cd01f2 Fixes #3517 2013-08-23 14:21:08 -04:00
DJSnapshot
a33a70fb92 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-23 06:45:23 -07:00
DJSnapshot
2525f4f8aa Moved hide_mode vars to global ticker instance. 2013-08-23 06:38:22 -07:00
DJSnapshot
7265509b1d Added vars to change hide mode. 2013-08-23 06:22:07 -07:00
DJSnapshot
4bd67e83b8 Changed vote settings to game mode votes other than extended will not be announced. 2013-08-23 05:47:45 -07:00
Segrain
5f8c8d9cce Fix for negative damage. 2013-08-23 15:33:51 +03:00
Segrain
245d33c1af Fix for invisible wounds. 2013-08-23 15:32:37 +03:00
Segrain
40909bde53 Deconstruction fix. 2013-08-23 15:31:37 +03:00
Segrain
cd2922cebe Name fix. 2013-08-23 15:30:49 +03:00
Segrain
acb4a01b9d Compile fix. 2013-08-23 10:42:29 +03:00
Zuhayr
2cf9a18f9e Merge pull request #3572 from Baystation12/master
Merging master into dev.
2013-08-22 23:01:15 -07:00
Zuhayr
3c139df703 Merge pull request #3569 from Mloc/hairfix
Small fixes to hair.
2013-08-22 22:48:11 -07:00
Zuhayr
75896a8824 Fixes from Ravensdale to robot code, unsure of issue numbers. 2013-08-22 16:10:06 -07:00
Zuhayr
4085aaf49b Added two verbs to dionaea nymphs, gave them their own file. 2013-08-22 16:03:37 -07:00
Zuhayr
493dded8fb Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-22 15:29:59 -07:00
Mloc-Argent
1106845cb6 further checks against mobs being loaded by hydraulic clamps.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-22 15:54:28 +01:00
Mloc
e20f2e1409 Small fixes to hair.
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-22 15:12:59 +01:00
Segrain
57c1a9a556 Code cleanup. 2013-08-22 10:11:49 +03:00
Mloc-Argent
5cee2d2ac2 Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles. 2013-08-21 23:26:59 +01:00
Mloc
29d4b9e422 Merge pull request #3561 from Erthilo/master
Fixes, emotes, books
2013-08-21 04:14:50 -07:00
Erthilo
d7fc84b42b Better gender checks. 2013-08-21 09:59:07 +01:00
Erthilo
d3775875df Revert "Experimentally readding Delete Book verb."
This reverts commit ec3000ecfb.
2013-08-21 09:10:21 +01:00
Zuhayr
dd0b69c695 Merge pull request #3564 from Segrain/dev
Operating table update.
2013-08-20 22:09:25 -07:00
Zuhayr
55aedda82e Merge pull request #3563 from Faerdan/dev
Removed delay when opening Nano UI windows
2013-08-20 22:08:52 -07:00
Segrain
3c99618f87 New verb. 2013-08-21 06:00:08 +03:00
Segrain
475fae2790 Missing comment. 2013-08-21 05:58:07 +03:00
Mark Aherne (Faerdan)
9b34f6b5b0 I added nanomanager.update_uis(src) to the cryo.dm Topic(). This method updates all UIs attached to the (src) object.Fixed issue with Nano UI windows taking seconds to load.
Removed user << browse_rsc() entries as they caused the delay. New assets (stylesheets, scripts, templates and images) have to be added to the client's send_resources proc or they will not exist on the client.
2013-08-21 01:50:50 +02:00
Mloc-Argent
31d1307ed2 Merge branch 'master' into dev
Conflicts:
	code/modules/virus2/effect.dm
2013-08-20 21:57:01 +01:00
Mloc-Argent
c188e46efc Removes alien virus.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-20 21:54:37 +01:00
Erthilo
13caefe138 Uncomments Space Law book content. 2013-08-20 14:20:46 +01:00
Erthilo
b6900d50fc Fixes admins not spawning as aliens on roundstart. 2013-08-20 14:20:33 +01:00
Erthilo
16d9b76599 Allow all mobs to emote. Standardising emote proc. 2013-08-20 10:38:57 +01:00
Erthilo
ec3000ecfb Experimentally readding Delete Book verb. 2013-08-20 10:37:57 +01:00