Commit Graph

23194 Commits

Author SHA1 Message Date
Spades
3e5784316e Revert "Reverts skin tones"
This reverts commit 8b3eab78d4.
2016-05-22 22:35:23 -04:00
Spades
8b3eab78d4 Reverts skin tones 2016-05-22 22:34:57 -04:00
Leshana
45889ae113 Fixes Issue #165 - Now will eat until completely full, not until almost full. 2016-05-22 22:10:23 -04:00
Neerti
3484d3c3d3 Merge pull request #1727 from Anewbe/guestpass
Ups guestpass max time to 2 hours
2016-05-22 21:52:48 -04:00
Cameron653
de4130cd07 Actually gives races their pay. Gives races equal pay. 2016-05-22 21:18:41 -04:00
Anewbe
455c774aa7 Ups guestpass max time to 2 hours 2016-05-22 20:08:08 -05:00
Datraen
96be57d787 Merge pull request #1720 from Anewbe/hardsuit_slowdown
Hardsuit Slowdown fix
2016-05-22 19:23:30 -04:00
Datraen
864ffc8f24 Merge pull request #1724 from Anewbe/removes_horsehead
Removes 2 spells from wiz until we get NewWiz (*COUGH NEERTI COUGH*)
2016-05-22 19:22:07 -04:00
Datraen
6af9bee876 Merge pull request #1723 from Yoshax/loadoutfixes
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-22 19:21:46 -04:00
Cameron653
eb403b3d6d Rename finds_eguns_vr to finds_eguns_vr.dm 2016-05-22 18:05:48 -04:00
Cameron653
5836b2c8cb Create finds_eguns_vr 2016-05-22 17:48:58 -04:00
Spades
b616e5bcdc Fixes #166
Problem solved by moving the vore alien mobs under vore.dmi and fixing
the icon states. My fault for making this screwy in the old code to
begin with.
2016-05-22 16:17:16 -04:00
Arokha Sieyes
7b0441ee04 Merge pull request #171 from VOREStation/zerotwo
Fixes for v1.02
2016-05-22 16:09:05 -04:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Yoshax
2f73167f39 Fixes chocolate milk seeming like milk in a glass 2016-05-22 18:56:53 +01:00
Anewbe
9e7676cc17 Removes Horsehead and Mindswap from Wizard spellbooks 2016-05-22 11:38:09 -05:00
Cameron653
31d53b8054 Adds in the "Subtle" command. (#173)
* This should add in subtle

* Subtle WIP

* WIP

* Adds in subtle verb.

* Adds in some coder comments saying

Where the parts would normally go
2016-05-22 12:12:06 -04:00
Yoshax
334a0238ae Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-22 14:22:47 +01:00
Spookerton
9d250e4062 Merge pull request #1716 from Anewbe/warden_armor_tweaks
Warden Jacket protects legs
2016-05-22 11:22:48 +01:00
Arokha Sieyes
73143c4fd6 Fixes #163 2016-05-22 02:18:44 -04:00
Arokha Sieyes
45dc312001 Adds SSD/ghost and idle time to examine text
Ghost timer displays immediately upon ghosting. Idle timer displays after 10 minutes of client inactivity. Helpful to know when someone needs to be cryo'd.

`[Disconnected/ghosted 11 minutes ago]` <-- client dropped and probably ain't comin' back.
`[Inactive for 18 minutes]` <-- fell asleep at keyboard
2016-05-22 02:16:15 -04:00
Arokha Sieyes
79e431ce04 Fixes #172 2016-05-21 23:48:39 -04:00
Arokha Sieyes
8595111251 Correct iconstates on some other alien types.
#166
2016-05-21 23:35:35 -04:00
Arokha Sieyes
11064b8ea8 Removes comments to make PR for Polaris. 2016-05-21 22:49:29 -04:00
Anewbe
5c0a4215a2 Moves all slowdown for Hardsuits to the backpack 2016-05-21 21:43:40 -05:00
Arokha Sieyes
10dad1867a Fixes invisible borgs after reset from wide sprites 2016-05-21 20:42:39 -04:00
Arokha Sieyes
592d17a145 Make whispers work inside objects/people 2016-05-21 20:37:01 -04:00
Leshana
985615d699 Fixes Issue #146 - Fix wrapping of belly buttons in vore panel if they exceed width of vore panel window. 2016-05-21 20:09:29 -04:00
Leshana
64fb673d69 Adds vixen belt fluff item. 2016-05-21 20:09:29 -04:00
Arokha Sieyes
ad27e107dd Adjust a comment to make sense. 2016-05-21 19:08:05 -04:00
Anewbe
0221b9bb9d Changes some fluffy bits to be more accurate 2016-05-21 18:00:54 -05:00
Anewbe
8c2d80aaf8 Warden Jacket protects legs 2016-05-21 17:45:01 -05:00
Spades
02ba44aa02 Beach.dmm fixes
Map is bigger and the forest spawns now.
2016-05-21 16:32:37 -04:00
Spades
0550a70bc2 Merge remote-tracking branch 'refs/remotes/origin/master' into dev-AceMapping 2016-05-21 14:56:17 -04:00
Spades
11e9eda4f4 Numerous tweaks and fixes.
- Fixed the teleporter room being labeled wrong. Now "Long-Range
Teleporter". Resolves #136
- Beach now has clutter. Resolves #141
- Beach now has borders. Resolves #142 but creates a new problem by
making the map too small. I'll fix this later.
2016-05-21 13:38:49 -04:00
Arokha Sieyes
adace754f0 Merge pull request #124 from VOREStation/heatfix
Initial Simple Fixes
2016-05-21 13:20:12 -04:00
Arokha Sieyes
803dff61f3 Fixes #134 2016-05-21 12:32:21 -04:00
Arokha Sieyes
10030a30fd Fixes #132
As message.
2016-05-21 12:31:37 -04:00
Datraen
dd4483d055 Merge pull request #1710 from Yoshax/fitnessvendor
Adds a new vending machine that vends fitness related products
2016-05-21 12:11:29 -04:00
Arokha Sieyes
232dd87922 Fixes #133
Removes reagent tag so reagents treat them as humans.
2016-05-21 11:49:45 -04:00
Arokha Sieyes
79cf3390cc Fixes #140
Plays sound to prey directly (might be too loud? Edit if so.)
2016-05-21 11:44:05 -04:00
Spades
4c64da73be Spawn timer fix
Resolves #123
2016-05-21 11:30:48 -04:00
Datraen
5d26364a4f Merge pull request #1711 from Yoshax/molotovfixes
Fixes never being able to light molotovs and makes throwing them less rubbish
2016-05-21 11:03:42 -04:00
Yoshax
0a6d1aa08d Makes detective belts hold detective guns 2016-05-21 15:21:07 +01:00
Yoshax
3044f6c080 Fixes never being able to light molotovs and makes throwing them less crap 2016-05-21 15:10:49 +01:00
Cameron653
41a4cdd9d7 Fixes a typo 2016-05-21 00:29:39 -04:00
Cameron653
f750a94b05 Adds nudity permit 2016-05-21 00:25:36 -04:00
Arokha Sieyes
61d90a6c75 Species heat/cold messages, allows prometheans 2016-05-21 00:06:56 -04:00
Datraen
a797f2007a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 2016-05-20 22:39:33 -04:00
Cameron653
a6084c201b Merge pull request #120 from Cameron653/master
Ports wedding rings from Citadel
2016-05-20 22:07:30 -04:00