cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,835 Commits 5 Branches 0 Tags
a325940040b167b030bb2633bd462a27d124c26c
Commit Graph

23009 Commits

Author SHA1 Message Date
Leshana
a325940040 Adds preference to mute remote LOOC chatter heard by admins. 
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
 2016-05-23 20:36:22 -04:00
Spades
38e0c6eb39 Merge pull request #181 from Cameron653/master 
Better xenoarch laser gun sprite
 2016-05-23 16:31:19 -04:00
Cameron653
36ef5e381c Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-23 14:06:08 -04:00
Cameron653
f7c7b5eb3a Removes pay bugfix 2016-05-23 14:06:06 -04:00
Cameron653
96b165ca6c Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-23 14:02:50 -04:00
Yoshax
eaf0e1e4dd Fixes #175 2016-05-23 18:07:36 +01:00
Yoshax
0554eac2fc Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-23 16:14:28 +01:00
Yoshax
2f9561c30e Makes pay equal for everyone 2016-05-23 16:14:11 +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
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
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
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
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
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
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
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
Cameron653
a6084c201b Merge pull request #120 from Cameron653/master 
Ports wedding rings from Citadel
 2016-05-20 22:07:30 -04:00