cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,091 Commits 8 Branches 0 Tags
eae29b9d692fdea73b64a2040a3928d73be49f01
Commit Graph

14293 Commits

Author SHA1 Message Date
Yoshax
0554eac2fc Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-23 16:14:28 +01:00
Spades
9797c3882a Merge pull request #195 from VOREStation/Dev-AceMobs 
Fixes large vore mob alignment, and also Ghost alert
 2016-05-23 08:16:54 -04:00
Spades
bbc70d1bd9 Ghost alert prompt no longer lies 2016-05-23 01:16:14 -04:00
Spades
d5710556a8 Faction wasn't correct! 2016-05-23 00:50:22 -04:00
Spades
1f24969d44 Tweak 2016-05-23 00:36:58 -04:00
Spades
0f36302739 Merge remote-tracking branch 'refs/remotes/origin/master' into Dev-AceMobs 2016-05-23 00:36:22 -04:00
Spades
baaf3b2335 Fixes #178 2016-05-23 00:36:12 -04:00
Spades
8c23ad27dc Fixes #192 2016-05-22 23:43:08 -04:00
Spades
76ea210f55 Merge remote-tracking branch 'refs/remotes/origin/master' into dev-Ace 2016-05-22 22:50:36 -04:00
Spades
39bc0b7df0 Merge pull request #190 from VOREStation/dev-Ace 
Revert skin tone change
 2016-05-22 22:50:17 -04:00
Spades
95ef0597e4 Reverts skin tone change 2016-05-22 22:36:41 -04:00
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
Cameron653
de4130cd07 Actually gives races their pay. Gives races equal pay. 2016-05-22 21:18:41 -04: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
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
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
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
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