Commit Graph

14277 Commits

Author SHA1 Message Date
Zuhayr
05e223d248 Minor fix for previous commit. 2013-08-28 22:28:31 -07:00
Zuhayr
f1f0a3e340 Added species_restricted list to clothing, added check for equipping clothing with species_restricted set. Only species on the list can equip the gear, if the equipper is human. 2013-08-28 22:17:40 -07:00
Zuhayr
0f998e34ef Sprites for Skrell hardsuits, sprites for Unathi breacher suit, updated icons for Vox helmets. 2013-08-28 22:00:39 -07:00
Zuhayr
93011399f0 CubeJackal's new sec uniforms. 2013-08-28 21:18:14 -07:00
Zuhayr
f6f9f34ed7 CubeJackal's resprites and additional sprites. 2013-08-28 21:12:07 -07:00
Zuhayr
0dba5c14b4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-28 20:40:19 -07:00
Zuhayr
fa36451ec5 Merge pull request #3593 from Segrain/master
Helper fix.
2013-08-27 19:50:46 -07:00
Zuhayr
00c4859765 Merge pull request #3598 from zylowalsh/Door_Control-Fix
Update door_control.dm
2013-08-27 19:50:22 -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
Mloc
c9deeedb2f Merge pull request #3595 from Erthilo/master
Fixes broken gender checks with hair
2013-08-27 15:02:40 -07:00
Erthilo
7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00
Segrain
19db0df4b5 Fix for hiding cyborgs from upload console. 2013-08-27 19:50:35 +03:00
Mloc
0444f6ec7c Merge pull request #3589 from Zuhayr/dev
Fixes for freeze.
2013-08-26 07:17:02 -07:00
Zuhayr
799c2fc94c Made Vox uncloneable. 2013-08-27 00:12:48 -07:00
Zuhayr
9565c94955 Secondary language fix. 2013-08-27 00:10:00 -07:00
Zuhayr
1b52559c72 Merged human.dm. 2013-08-26 22:45:11 -07:00
Zuhayr
a846a579c1 Merge pull request #3586 from Baystation12/dev
Dev
2013-08-25 01:40:45 -07:00
Zuhayr
bb31ad24d1 Merge pull request #3581 from Zuhayr/dev
Changeling/malf balance tweaks, vox shuttle fixes, few other fixes.
2013-08-25 01:33:26 -07:00
Zuhayr
d3c7628140 Added fancy hat to fixed vox shuttle. 2013-08-25 15:24:16 -07:00
Zuhayr
bf41fbb1a9 Using Segrain's map. 2013-08-25 14:24:56 -07:00
Zuhayr
856aa6a60b Fixes #3555 2013-08-25 13:47:45 -07:00
Zuhayr
9d8f3d32f9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-25 13:26:08 -07:00
Zuhayr
9b48ae3be4 Forgot to add the fancy leader hat to the vox shuttle earlier. 2013-08-25 02:55:24 -07:00
Zuhayr
8c58af4c65 Vox theft objectives should check lockers and other storage now. 2013-08-25 02:53:07 -07:00
Zuhayr
8c1f842b6a Allowed changeling husks to be cloned. 2013-08-25 02:42:17 -07:00
Zuhayr
7e0d26dab1 Commented out APC switching from Malf AI. 2013-08-25 02:35:05 -07:00
Zuhayr
4ea434da1d Added a delay to vent crawling. 2013-08-25 02:27:52 -07:00
Zuhayr
11c3de6da1 Got a vox shuttle check the wrong way around. 2013-08-25 02:15:28 -07:00
Zuhayr
8d01974057 Small language fixes, oops. 2013-08-25 02:13:23 -07:00
Zuhayr
10183ed170 Expanded Vox shuttle, adjusted loadouts, added shutters, added basic preliminary hardware for cycling airlocks. 2013-08-25 02:09:31 -07:00
Zuhayr
64e705ba33 Adding radiation feeding to dionaea, tweaking species values, adding shock to lighting checks, adding light checks to diona nymphs. 2013-08-25 02:08:09 -07:00
Zuhayr
eb1068a12e Added a proper diona resting sprite. 2013-08-25 01:05:43 -07:00
Zuhayr
b0d4b1967b Uncommented languages for experimental purposes. 2013-08-25 01:05:24 -07:00
Segrain
e85ddd3b9a Fix for unisex hairstyles. 2013-08-25 09:27:05 +03:00
Zuhayr
a5f79057d1 Merge pull request #3585 from Segrain/master
Hairfix.
2013-08-24 22:50:36 -07:00
Zuhayr
6e2d5b62b2 Merge pull request #3584 from Kilakk/master
Fixed medical HUDs not being able to set SSD status correctly
2013-08-24 22:19:10 -07:00
Segrain
1e3bc659d5 Vox skipjack fix. 2013-08-25 08:13:40 +03: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
Kilakk
86d709e150 Fixed medical HUDs not being able to set SSD status correctly 2013-08-24 23:52:00 -04: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
Zuhayr
2216aed7ce Merge pull request #3582 from alex-gh/add_rezadone
Ported Rezadone (Heals clone damage without cryo) from tg-station
2013-08-24 09:56:26 -07:00
Alex
01ac4be991 Ported Rezadone (Heals clone damage without cryo) from tg-station 2013-08-24 18:35:10 +02:00
Mloc
e8e824d9da Merge pull request #3580 from Zuhayr/dev
Dev
2013-08-24 09:15:56 -07:00
Mloc
2658e1f043 Merge pull request #3579 from Zuhayr/dev
Vox tweaks/fixes, dionaea changes.
2013-08-24 09:12:10 -07:00
Zuhayr
3cd029d69b Merge pull request #3578 from Segrain/dev
Same mapfix. Third time is a charm.
2013-08-23 22:42:27 -07:00
Segrain
f1f6c07ded Same mapfix, part 2. Also, minor update. 2013-08-24 09:35:14 +03:00
Segrain
44b5ed8fd3 Same mapfix, part 1. 2013-08-24 09:27:41 +03:00