Zuhayr
dabd0866a2
As above.
2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77
Added CubeJackal's security gear to the appropriate lockers.
2013-08-28 22:31:22 -07:00
Zuhayr
0dba5c14b4
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-28 20:40:19 -07:00
Philip
66071c81ba
Update door_control.dm
...
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
2013-08-27 16:38:07 -06:00
Zuhayr
8c58af4c65
Vox theft objectives should check lockers and other storage now.
2013-08-25 02:53:07 -07:00
Zuhayr
11c3de6da1
Got a vox shuttle check the wrong way around.
2013-08-25 02:15:28 -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
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
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
4bd67e83b8
Changed vote settings to game mode votes other than extended will not be announced.
2013-08-23 05:47:45 -07: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
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
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
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
Erthilo
13caefe138
Uncomments Space Law book content.
2013-08-20 14:20:46 +01:00
Mloc-Argent
7bcb5f5648
Merge branch 'master' into dev
2013-08-20 10:04:56 +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
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
8d98fe7582
Merge resolution.
2013-08-19 16:07:03 -07:00
Zuhayr
3e70c949e6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-19 16:04:34 -07:00
Zuhayr
67f3f5a3c4
Podmen prompt/spawn should work now.
2013-08-19 15:58:08 -07:00
Zuhayr
5bd6170e0c
Diona will now be born from pods as nymphs.
2013-08-19 15:20:13 -07:00
Zuhayr
cffac0bfc2
Using dev map.
2013-08-19 15:05:44 -07:00
Zuhayr
6d8bb8dfe6
Hopefully a fix for Dionaea weirdness regarding pods.
2013-08-19 11:53:24 -07:00
Segrain
18b26c57b7
Inertia fix.
2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21
Fix for #3549 .
2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc
Merge pull request #3547 from Zuhayr/master
...
Borer prompt, dionaea fix
2013-08-19 01:27:11 -07:00
