cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,037 Commits 5 Branches 0 Tags
81c19c62a321c196ea025cada1e30ef1816a07a9
Commit Graph

27853 Commits

Author SHA1 Message Date
Neerti
81c19c62a3 Merge pull request #5218 from Mewchild/MC-Snowsuit 
Fixes miners not being able to take supply snowsuit
 2018-04-28 22:10:12 -04:00
Anewbe
31963b9c20 Merge pull request #5221 from ReddeyfishVor/patch-4 
Prevent negative weight events from happening
 2018-04-28 20:32:33 -05:00
ReddeyfishVor
3c931ad535 Prevent negative weight events from happening 2018-04-27 17:10:41 -07:00
Atermonera
c8d2f47f06 Merge pull request #5210 from VOREStation/pol-circuitexp 
Fixes an exploit with circuit printers
 2018-04-27 11:12:46 -07:00
Mewchild
78efe65c1c Fixes miners not being able to take supply snowsuit 2018-04-27 12:12:24 -05:00
Leshana
f8b2d3e4d6 Alternative way to avoid tooltips on mimics. 2018-04-27 09:49:02 -04:00
Leshana
d05163baba Fix missing descriptions on guns. 
examine() is supposed to return a value, these ones did not.
 2018-04-27 09:48:43 -04:00
Arokha Sieyes
3b4b9ea988 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-27 09:48:27 -04:00
Arokha Sieyes
3f6ed1cea7 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-25 20:47:17 -04:00
Aronai Sieyes
a849010ab1 Makes organ removal/attachment right again (#5192) 
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
 2018-04-25 12:03:10 -07:00
Atermonera
45284a6669 Merge pull request #5203 from Cerebulon/greenpumps 
Fixes pumpkins and watermelon sprites
 2018-04-25 12:01:42 -07:00
Atermonera
7d6fba3ba1 Merge pull request #5194 from Anewbe/species_economic 
Species economic modifier is now a species var
 2018-04-24 23:26:41 -07:00
Anewbe
a75c575491 Merge pull request #5200 from VOREStation/vplk-stonedmc-sync 
Port "The Punisher" (subsystems/MC impovement) from TG
 2018-04-24 15:20:57 -05:00
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
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
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
Anewbe
5cfb443cce Communicator visibility is now on a per-character basis, rather than global 2018-04-21 17:08:39 -05: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
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
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
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
Anewbe
aecd924ef2 Merge pull request #5161 from Atermonera/refactor_human_examine 
Refactors human/examine.dm
 2018-04-19 18:39:00 -05:00
Anewbe
718247aa4f Merge pull request #5188 from Mechoid/No_Thanks_Smol_Dudes 
Fixes mob wall-bashing.
 2018-04-19 18:31:09 -05:00
Anewbe
a89d51ccb3 Merge pull request #5185 from Verkister/ohsheet 
Fixes borg synth sheet naming when depleted to 1
 2018-04-19 18:30:06 -05:00
Anewbe
323d3aa42c Species economic modifier is now a species var 2018-04-19 18:06:02 -05:00
Arokha Sieyes
b5b9bfcb55 Fix access on security suit crates 2018-04-19 18:42:50 -04:00
Mechoid
d362541220 Fixes mob wall-bashing. 2018-04-18 21:53:58 -07:00
Anewbe
d139e961b9 PunPun's clothes show up when he spawns 2018-04-18 23:26:31 -05:00
Leshana
c4d714dea8 Replaces set_light with direct update_lumcount for planet suns. 
Setting lights on every single turf takes way too long.  Instead of havingto create a light source for every single outdoor turf, we find the corners to light up and apply the sunlight to them directly.
We also make sure to avoid having planet sunlight being 4x too strong, which would happen if we naively looped over all corners of all outdoor turfs.
Note: This has the side effect of making the sun's light and color ACCURATELY reflected on turfs.  Previous code doubled up on light and appeared brighter than it should.
 2018-04-18 21:54:58 -04:00
Leshana
471e544a61 Revert "Merge pull request #4779 from Neerti/2/1/2018_make_the_sun_not_lag_again" 
This reverts commit f4df29713d, reversing
changes made to 337e5e7436.
 2018-04-18 18:08:16 -04:00
Atermonera
35b60f19f8 Merge pull request #5175 from Anewbe/selective_aooc 
Removes AOOC from non-team antags
 2018-04-18 14:21:01 -07:00
Verkister
88c1a7d845 Fixes borg synth sheet naming when depleted to 1 
-The thing changing the sheet stack names to singular/plural no longer breaks the naming for borg sheet synthesizers.
 2018-04-18 16:07:36 +03:00
MarinaGryphon
9e57b11a87 Fixes various implant/admin verb typos (#5177) 
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
 2018-04-17 23:05:12 -05:00
Anewbe
c29d830e28 Merge pull request #5166 from Heroman3003/closet-coloring-fix 
Fixed closet painter making non-closet 'closets' invisible
 2018-04-17 23:04:43 -05:00
Anewbe
31922d8f37 Merge pull request #5174 from Verkister/patch-13 
Fixes simplemob icons when killed while resting.
 2018-04-17 22:58:54 -05:00
atermonera
5411e74e1a Moved defines to a __define file 2018-04-15 18:32:51 -07:00