cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 00:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,295 Commits 74 Branches 23 Tags
161ec9ab98b51ce59685fcafe7342a75f227c881
Commit Graph

6080 Commits

Author SHA1 Message Date
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
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
55aedda82e Merge pull request #3563 from Faerdan/dev 
Removed delay when opening Nano UI windows
 2013-08-20 22:08:52 -07: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
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)
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
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
323fa2fe9c Reapplying carbon changes to borers, accidentally overwrote 'em. 2013-08-19 16:25:13 -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
809c17710d Borer prompt will now actually work without runtimes. 2013-08-19 15:46:40 -07:00
Zuhayr
5bd6170e0c Diona will now be born from pods as nymphs. 2013-08-19 15:20:13 -07:00
Zuhayr
68285fd85b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-19 15:06:28 -07:00
Zuhayr
cffac0bfc2 Using dev map. 2013-08-19 15:05:44 -07:00
Zuhayr
320a009e2d Made Dionaea whitelisted. 2013-08-19 12:38:48 -07:00
Zuhayr
e05976e1b9 Confirmation prompt for borers. 2013-08-19 11:53:03 -07: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
83bc47a47e Temporary fix for #3543, gave bees an icon_dead state 
* Also, possibly stopped bees from moving around while deceased (in this case, while not having stat CONSCIOUS)
* Bees don't have an actual death icon, just a placeholder bees1 for now
 2013-08-18 23:47:11 -04:00
Kilakk
8d2910da37 Bees are simple_animals, not machines. Bluh. 2013-08-18 22:52:39 -04:00
Kilakk
6d2cd82a14 Added a fax machine to send messages to centcom with. 
* Formatting can be seen by admins
* HTML tags can be used in replies
* Replies are sent directly to the fax machine and have a fancy stamp on them
* Currently uses access_lawyer but this might change
 2013-08-18 14:39:08 -04:00
Zuhayr
e73fea52aa Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-18 02:09:06 -07:00
Segrain
2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Mloc-Argent
404c12f61e Much more probable fix for deadchat breaking on clientless ghosts. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-17 14:18:01 +01:00
Zuhayr
ecce26f07b Allowed monkeys to use radios. 2013-08-17 19:59:52 -07:00
Zuhayr
5e93bfa8c4 Missing a paren. 2013-08-17 19:24:13 -07:00
Zuhayr
1fa95ab1bf Allowed whispers to reach host brains. 2013-08-17 19:17:47 -07:00
Zuhayr
4f553eab06 Allowed captive brains to actually understand things. 2013-08-17 19:15:11 -07:00
Zuhayr
b9aa75e877 Added a headgear check to borer infestation. 2013-08-17 19:11:34 -07:00
Zuhayr
a30f7167bd Removed outdated var, fixed failure to show garbled monkey speech. 2013-08-17 19:03:20 -07:00
Zuhayr
9cab832513 Fixed issues with ;. 2013-08-17 18:41:29 -07:00
Mloc-Argent
e809be825e Merge branch 'master' into dev 
Conflicts:
	code/modules/mob/say.dm
 2013-08-16 22:22:42 +01:00
Segrain
2ea03c0925 Fix for #3535. 2013-08-17 00:26:27 +03:00
Mloc
326b51f4a4 Merge pull request #3531 from Zuhayr/dev 
Languages/species mucking around.
 2013-08-16 11:33:03 -07:00