Commit Graph

6022 Commits

Author SHA1 Message Date
ZomgPonies
bb813be5d0 Optimized round-start loading time 2013-09-08 14:37:32 -04:00
ZomgPonies
a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
ZomgPonies
ea91047ce2 Janicart/Ambulance overhaul && Added Doppler Array sprites & map 2013-09-08 09:23:49 -04:00
ZomgPonies
f35ac25847 Detective can now reskin his gun 2013-09-08 07:25:30 -04:00
ZomgPonies
d2d7104703 Added fax machine to IA office 2013-09-07 21:01:43 -04:00
ZomgPonies
b3f5923ade Trying out new ZAS system 2013-09-07 09:22:51 -04:00
ZomgPonies
5047d7d557 Adding gagball item, because WIN 2013-09-06 19:48:58 -04:00
ZomgPonies
7d1e8c40b2 Fat people can eat non-fat people, cause win. 2013-09-06 18:34:07 -04:00
ZomgPonies
2883d73025 DB ban code fix redux 2013-09-06 17:48:27 -04:00
ZomgPonies
d89ed59be4 Library book delete admin command 2013-09-06 17:01:21 -04:00
ZomgPonies
a784670e21 Lowering string count 2013-09-06 13:07:54 -04:00
ZomgPonies
ac0ddde997 Updated DB ban code 2013-09-06 08:58:57 -04:00
ZomgPonies
df52b1c3fd Merge branch 'master' of https://github.com/ZomgPonies/Baystation12 2013-09-06 08:03:24 -04:00
ZomgPonies
d342a1735c People on DocCarts can pull rollerbeds 2013-09-06 08:03:18 -04:00
ZomgPonies
19d85cdf03 Merge pull request #7 from Kodos-Atoz/master
Update hypospray.dm
2013-09-06 04:56:48 -07:00
Kodos-Atoz
a841cff4bb Update hypospray.dm
Changed starting CMO Hypo contents
2013-09-06 06:51:52 -05:00
ZomgPonies
372c4c9dcc Re-adding code to allow ambulances to pull rollerbeds. 2013-09-06 06:45:50 -04:00
ZomgPonies
21840e1053 Missing line to re-add ponies. Ponies. Wheee. 2013-09-05 14:45:12 -04:00
ZomgPonies
ed8714550c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master
Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html
2013-09-05 13:29:34 -04:00
Mloc-Argent
72d158143b Previous commit apparently got swallowed by the git monster.
Turns off auto FILE_DIR in .dme, fixes compile error.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-02 21:50:58 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-28 18:49:00 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00
Zuhayr
a5f79057d1 Merge pull request #3585 from Segrain/master
Hairfix.
2013-08-24 22:50:36 -07:00
Segrain
e85ddd3b9a Fix for unisex hairstyles. 2013-08-25 09:27:05 +03:00
Kilakk
86d709e150 Fixed medical HUDs not being able to set SSD status correctly 2013-08-24 23:52:00 -04:00
ZomgPonies
91bc429721 Merge branch 'pr/4'
Conflicts:
	.gitignore
2013-08-24 17:25:58 -04: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
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
ZomgPonies
447b79e959 Clown fixes: Access, Waterflower can be filled with anything 2013-08-20 18:37:47 -04: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
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
ZomgPonies
cd4fe5affa Malf AI action - Robot Factory 2013-08-19 19:27:47 -04: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
ZomgPonies
9241865f15 Merge pull request #3 from Baystation12/master
BS12:master > Poniesmaster
2013-08-19 14:22:34 -07:00
Chinsky
4262e6b6bc Merge pull request #3547 from Zuhayr/master
Borer prompt, dionaea fix
2013-08-19 01:27:11 -07:00
Zuhayr
809c17710d Borer prompt will now actually work without runtimes. 2013-08-19 15:46:40 -07:00
Zuhayr
320a009e2d Made Dionaea whitelisted. 2013-08-19 12:38:48 -07:00