Commit Graph

10673 Commits

Author SHA1 Message Date
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
Erthilo
de6eb16e1a Fixes being able to have alien species hair on humans or other species. 2013-08-20 10:37:05 +01:00
Mloc-Argent
7bcb5f5648 Merge branch 'master' into dev 2013-08-20 10:04:56 +01:00
Mloc
de79aa733b More dismemberment fixes
More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-20 02:06:56 +01:00
Mloc-Argent
b2a3405f80 Two fixes for dismemberment.
Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-19 23:49:53 +01:00
Mark Aherne (Faerdan)
b788d8686f I added nanomanager.update_uis(src) to the cryo.dm Topic(). This method updates all UIs attached to the (src) object. 2013-08-19 23:14:14 +01:00
Mark Aherne (Faerdan)
5f4cc7e108 Nano UI Framework
------------------------------------------------------------
nanoui - For creating and updating browser UIs
manomanager - For managing nanouis
Includes the "D:\Development\SS13-TG\code\game\machinery\cryo.dm" rebuilt using Nano.
Templates are stored in /nano/templates

This code is in development, it's also not commented yet.
2013-08-19 22:52:23 +01:00
Segrain
71e52b57fe Fix for #3552. 2013-08-19 23:25:03 +03:00
Zuhayr
839546d173 Added new armour to raider generation proc. 2013-08-19 19:05:32 -07:00
Zuhayr
e3780520ee Tiny Diona language fix. 2013-08-19 19:02:40 -07:00
Zuhayr
b84f85656c New vox armour. 2013-08-19 19:02:27 -07:00
Zuhayr
06cc5bc593 Compile fix, gah. 2013-08-19 18:56:32 -07:00
Zuhayr
e138ff4a4b Name fix for diona. 2013-08-19 17:23:22 -07:00
Zuhayr
a697567806 Added abilities for nymphs/evolution to a final form. 2013-08-19 17:22:23 -07:00
Zuhayr
4c1e7f2084 Reapplying diona nymph changes to podmen code. 2013-08-19 16:33:29 -07:00
Zuhayr
323fa2fe9c Reapplying carbon changes to borers, accidentally overwrote 'em. 2013-08-19 16:25:13 -07:00