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
Kilakk
abe170e006
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
baystation12.dme
2013-08-19 00:27:28 -04:00
Kilakk
8d2910da37
Bees are simple_animals, not machines. Bluh.
2013-08-18 22:52:39 -04:00
Segrain
2304b743ce
Reagent scanner's addition.
2013-08-17 17:00:33 +03:00
Segrain
8456647120
Type check.
2013-08-17 16:58:57 +03:00
Zuhayr
a30f7167bd
Removed outdated var, fixed failure to show garbled monkey speech.
2013-08-17 19:03:20 -07:00
Mloc-Argent
e809be825e
Merge branch 'master' into dev
...
Conflicts:
code/modules/mob/say.dm
2013-08-16 22:22:42 +01:00
Zuhayr
9c58348879
Holodeck exploit fix.
2013-08-17 04:41:28 -07:00
Mloc-Argent
1e980a9cc1
Merge branch 'master' into dev
2013-08-15 15:29:53 +01:00
Zuhayr
d937900d13
Compile fix.
2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44
Merge resolution in Engineering.dm
2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0
Engineering merge.
2013-08-14 20:00:38 -07:00
Zuhayr
c19d136996
Podman fix.
2013-08-14 19:58:39 -07:00
Chinsky
b8dc7cc939
Merge pull request #3505 from Zuhayr/master
...
Language cleanup/mouse speech fix.
2013-08-13 16:48:45 -07:00
Zuhayr
e10a433800
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:18 -07:00
Zuhayr
623a2978b7
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:09 -07:00
Zuhayr
1bdb1b6694
Merge pull request #3507 from Segrain/master
...
Internals for everyone.
2013-08-13 16:39:14 -07:00
DJSnapshot
cb20332de5
Added potential for chief engineer's locker to spawn with either a brown vest or webbing
2013-08-13 16:16:20 -07:00
Jamini
f05c44dc23
Praying this works
...
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-08-13 18:57:08 -04:00
Mloc-Argent
7ac43fa871
Merge branch 'master' into dev
2013-08-13 22:21:37 +01:00
