cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,269 Commits 7 Branches 0 Tags
591077cbbaaa45c4dbdeb0bebe02f26b51b18e1c
Commit Graph

32069 Commits

Author SHA1 Message Date
Atermonera
1fc11fe8c5 Merge pull request #5187 from Anewbe/comms_tweak 
Communicator visibility is now on a per-character basis, rather than global
 2018-04-23 18:59:00 -07:00
Aronai Sieyes
4cab59e28a Merge pull request #3546 from VOREStation/aro-shelters2 
Port /tg/ lavaland shelters
 2018-04-23 17:35:46 -04:00
Arokha Sieyes
ac7e949779 Tab2Space ssair 2018-04-23 17:23:03 -04:00
Cameron653
a6b25bc79a whoops 
Credit to Nestor for doing the original coding, however.
 2018-04-23 17:00:32 -04:00
Cameron653
aa97863a73 Ever hit the "push" button and then realize "Oh shit I forgot something"? 2018-04-23 16:54:22 -04:00
Cameron653
6c75c72dd2 Adds missing Teshari DSI 
https://i.imgur.com/UmrLEDT.png - (White)
https://i.imgur.com/vXGIFi3.png - (Light Blue)
https://i.imgur.com/H8NFgTD.png (Light Pink)
Operates the same as every other DSI.
 2018-04-23 16:51:37 -04:00
Aronai Sieyes
a53e7b534c Merge pull request #3528 from Verkister/patch-20 
Metabolism trait adjustments.
 2018-04-23 16:34:01 -04:00
Aronai Sieyes
5e7a397e68 Merge pull request #3542 from VOREStation/vplk-slime-buckle-attack-fix 
First effort fix of the slimes integration with taur riding.
 2018-04-23 16:33:22 -04:00
Anewbe
5fcfe63e38 Merge pull request #5199 from VOREStation/vplk-subystem-constants 
Use define constants for subsystem init order and priority.
 2018-04-23 15:17:23 -05:00
Arokha Sieyes
cd865a176b Fix a table sprite and a shelter window layer 2018-04-23 15:44:13 -04:00
Arokha Sieyes
d5c9d3cb4e Port /tg/ lavaland shelters 
Nanotech twist rather than bluespace, but whatever.
 2018-04-23 15:25:35 -04:00
Aronai Sieyes
392de060f9 Merge pull request #3545 from HzDonut/master 
Final LeMat Fix
 2018-04-23 15:21:41 -04:00
Aronai Sieyes
15d590a967 Merge pull request #3537 from VOREStation/vplk-xenochimera-base 
Fix Scree and Scree Accessories
 2018-04-23 15:15:08 -04:00
Arokha Sieyes
43299a5e3a POLARIS? - Pause SSair on map loading more thoroughly 2018-04-23 15:12:33 -04:00
HzDonut
980c9bea44 LeMat Fix 
Argh
 2018-04-23 09:28:33 -04:00
Leshana
2a4182cc8e First effort fix of the slimes integration with taur riding. 2018-04-22 15:24:48 -04:00
Anewbe
b4e59c3949 Merge pull request #5198 from Cameron653/patch-1 
Makes clothing use the correct sprite sheet.
 2018-04-22 11:53:40 -05:00
Anewbe
152093cda0 Merge pull request #5197 from VOREStation/port-3500-brig-timers 
Rewrite brig timers to initialize properly
 2018-04-22 11:52:21 -05:00
Anewbe
4a039d94a5 Merge pull request #5196 from Schnayy/plushiefix 
Carp Plushie Fix
 2018-04-22 11:49:52 -05:00
Verkister
4bf17aea58 gr 2018-04-22 15:51:19 +03:00
Verkister
f7324044f3 Update bellymodes_vr.dm 2018-04-22 15:50:27 +03:00
Verkister
ad06e44f15 Merge branch 'master' into patch-16 2018-04-22 15:41:18 +03:00
Leshana
8ac6b0bfe9 Fix Scree and Scree Accessories 2018-04-21 23:22:08 -04:00
Heroman3003
dcbf8627ef Fixed size-affecting reagents not working when ingested 2018-04-22 08:16:09 +10:00
Anewbe
5cfb443cce Communicator visibility is now on a per-character basis, rather than global 2018-04-21 17:08:39 -05:00
Verkister
4c78ed0183 Metabolism trait adjustments. 
-Adjusts the metabolism traits some more to get them in line with some sort of numerical logic with better documentation.
-Slow metabolism is now -20% of default on every field.
-Fast metabolism now gives +20% processing rate and hunger/WG are both scaled to Teshari level (4x default)
-Apex metabolism stats now scaled to double the fast metabolism (+40%, 8x, still lower than pre-nerf). Also returns consistency with apex hunger/WG ratio that got bloopered in the lazy nerf. (gains left way too fast compared to hunger nerf. Gael just gained almost 5 pounds within overeat duration of like 10~15min lmao)
 2018-04-21 13:26:10 +03:00
kcin2001
e102d2b2fe adds in the code for the spirit markings 2018-04-21 00:09:34 -07:00
Anewbe
4fc824c089 Merge pull request #5195 from VOREStation/vplk-april-fixes 
Sundry Fixes - Emitters, Bedsheets, Conveyors
 2018-04-21 02:04:59 -05:00
Anewbe
7e8c042b6f Merge pull request #5172 from ReddeyfishVor/events 
Add several new events
 2018-04-21 02:00:25 -05:00
Anewbe
46b69fea68 Merge pull request #5193 from VOREStation/pol-secarmor 
Fix access on security suit crates
 2018-04-21 01:53:53 -05:00
Cerebulon
818ff82c4d Fixes pumpkins and watermelon sprites 2018-04-21 06:08:20 +01:00
Aronai Sieyes
3304ab2003 Merge pull request #3516 from VOREStation/aro-bucklenomove 
Fix buckle drag move lack of check for living.
 2018-04-20 18:08:49 -04:00
Arokha Sieyes
c7e2c9b3a4 Fixes #3508 2018-04-20 17:57:45 -04:00
Kyle Spier-Swenson
1884742ca2 Random micro optimization to the mc I thought of while looking at something else 
We can save the second ss_flags access by using bitflag ma~~th~~gic
(Ported from tgstation/tgstation#36352)
 2018-04-20 17:55:08 -04:00
Leshana
0094c74b64 Ports "The punisher!" 
* From tgstation/tgstation#27196
* The mc will now punish subsystems that overrun their tick allotment with less allotment in later fires.
* The punisher also delays the next fire of subsystems that overrun. Because of how this is ends up being calculated, this will almost never actually kick in, but sometimes subsystems like garbage will overrun into multiple ticks, so delaying their next fire is needed.
* The punisher does not delay the next fire of SS_TICKER subsystems (tgstation/tgstation#34964)
Note: SS_KEEP_TIMING subsystems do not get their next fire delayed.
 2018-04-20 17:55:07 -04:00
Arokha Sieyes
50cfcf0430 Fix buckle drag move lack of check for living. 
Unfortunately fixes Iris's superstrength.
 2018-04-20 17:38:48 -04:00
Cameron653
69407fad60 Makes clothing use the correct sprite sheet. 
For oddities like promethean teshari.
Without this, oddities like this happen https://i.imgur.com/DzLBviC.png
 2018-04-20 17:19:29 -04:00
elgeonmb
c12368b887 Adds new robot codex (#5178) 
* adds new robot codex

* appeases ater
 2018-04-20 10:30:06 -07:00
Atermonera
cfd14786fa Merge pull request #5190 from Anewbe/punpun_clothes 
PunPun's clothes show up when he spawns
 2018-04-20 10:24:59 -07:00
Leshana
63257bf40b Use define constants for subsystem init order and priority. 
Replaced all hard coded numbers for subsystem priority with defines in subsystem.dm - Much easier to see them in order that way.
 2018-04-20 13:18:55 -04:00
Arokha Sieyes
856a6db696 Rewrite brig timers to initialize properly 2018-04-20 12:04:02 -04:00
Schnayy
b56299cc57 - Fixes carp plushies to now have a base sprite & be selectable in the loadout. 
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
 2018-04-20 09:55:09 -05:00
Arokha Sieyes
97c386df17 Fixes qpad deconstruct 
Fixes #3509
 2018-04-20 02:02:06 -04:00
Neerti
0d957e35a5 Merge pull request #5189 from VOREStation/vplk-planetary-sun-lumcount 
Optimize Planetary Sun Mk II
 2018-04-19 20:58:51 -04:00
Leshana
438203393e POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-19 20:51:25 -04:00
Leshana
c7cd04b2bb POLARIS: Fix emitters connected to powernet remotely. 
Ensure when we unanchor an emitter that we disconnect from powernet.
 2018-04-19 20:51:15 -04:00
Leshana
449597f148 POLARIS: Fix conveyors on dynamically loaded maps obeying switches. 
Converted conveyors New() to initialize() so that runtime loaded maps will have conveyors and switches find each other.
 2018-04-19 20:51:05 -04:00
Aronai Sieyes
fa8f21673c Merge pull request #3506 from VOREStation/aro-portallocal 
Fix cascade portal teleporting
 2018-04-19 20:30:34 -04:00
Aronai Sieyes
7ead58510c Merge pull request #3483 from VOREStation/aro-sstailears 
Add ability for shapeshifters to change ears, tails, wings
 2018-04-19 20:26:23 -04:00
Aronai Sieyes
b42f8c3df2 Merge pull request #3501 from VOREStation/aro-is3478 
Cleans up custom species icon base code
 2018-04-19 20:26:13 -04:00