cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,363 Commits 7 Branches 0 Tags
6d35de30b4753823bf641e0be4a511ad0cbdf1ce
Commit Graph

35731 Commits

Author SHA1 Message Date
Heroman
6d35de30b4 Less pain, return of minor burn/brute 2020-01-05 08:17:19 +10:00
Heroman
c434b01190 Wrong calculation + return of speed buff 2020-01-04 09:12:54 +10:00
Heroman
418aa9195a Missed parenthesis 2020-01-04 08:51:48 +10:00
Heroman
a56e3b4990 Rebalances the debuff again, no defensive penalties, much larger offensive penalties 2020-01-04 08:44:23 +10:00
Heroman
88323a1121 Removes genetic mutations, removes cryotubes from resleeving labs 2020-01-04 07:42:57 +10:00
Heroman
e2cd78159d removes unnecessary 0's 2019-12-31 20:36:43 +10:00
Heroman
89636b06c5 Adjusts the sickness values 2019-12-31 20:33:40 +10:00
Heroman
f8e2e7bf19 Removes bleeding rate debuff from resleeving sickness 2019-12-30 06:02:07 +10:00
Heroman
d7a7110b94 Rebalances time calculation for sickness. 45 new maximum, 30 still a median, 15 still a minimum 2019-12-30 05:18:29 +10:00
Heroman
6eff7bd443 Undoes the speed buff for the printer (keeps the healthcap removal) 2019-12-29 20:21:16 +10:00
Heroman
821ecf1f88 Makes the sickness properly refresh the duration 2019-12-29 17:26:18 +10:00
Heroman
be15b324e7 Buffs body printer 2019-12-29 10:21:42 +10:00
Heroman
eb5a3ebf57 Adds resleeving sickness 2019-12-29 10:12:39 +10:00
Novacat
7599ad7041 Merge pull request #6369 from VOREStation/upstream-merge-6584 
[MIRROR] Printable Spray Bottles
 2019-12-25 20:13:56 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers 
Printable Spray Bottles
 2019-12-25 18:10:16 -05:00
Atermonera
d6b16dd09e Merge pull request #6585 from Verkister/patch-31 
Fixes gentle hairstyle missing
 2019-12-25 18:10:05 -05:00
Novacat
860566a1b6 Merge pull request #6350 from Verkister/tallboys 
Fixes resizing for icons taller than 32p
 2019-12-24 12:01:30 -05:00
Novacat
01b57eb28f Merge pull request #6344 from VOREStation/upstream-merge-6572 
[MIRROR] Buffs radiation so it isn't defeated by a thin sheet of lead.
 2019-12-24 11:59:27 -05:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Novacat
acc510a92e Merge pull request #6354 from VOREStation/upstream-merge-6480 
[MIRROR] Fixes mech projectile armor thinking test projectiles are dangerous
 2019-12-22 11:01:23 -05:00
Unknown
26a1bca72d Compatibility Fixes One 2019-12-22 10:52:45 -05:00
Spades
e70816822b Merge pull request #6298 from Sebbe9123/dogborgpounce 
Buffs dogborg pounce
 2019-12-22 10:41:57 -05:00
Novacat
11405d5c00 Merge pull request #6358 from VOREStation/upstream-merge-6582 
[MIRROR] QM can now get optical meson scanners
 2019-12-22 10:35:34 -05:00
Novacat
324db0bc2b Merge pull request #6357 from VOREStation/upstream-merge-6580 
[MIRROR] APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 10:35:25 -05:00
Verkister
928bb57e7a almost forgot pais 2019-12-22 11:05:00 +02:00
Atermonera
b6a81efb9a Merge pull request #6582 from Shadow-Quill/Material-Scanner-Access 
QM can now get optical meson scanners
 2019-12-22 01:59:32 -05:00
Atermonera
2ec24a29e3 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click 
APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 01:58:19 -05:00
Shadow-Quill
07f92de49a Belly Fixed 2019-12-22 00:40:58 -06:00
Atermonera
eeb8310aa2 Fixes mech projectile armor thinking test projectiles are dangerous 2019-12-21 23:58:07 -05:00
Novacat
8b9806c8c4 Merge pull request #6351 from VOREStation/upstream-merge-6578 
[MIRROR] Add sanity check to cyborg _onclick.
 2019-12-21 16:14:22 -05:00
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling 
Light Replacer QOL
 2019-12-21 14:31:10 -05:00
Atermonera
992312087f Merge pull request #6578 from Mechoid/FixCyborgOnClick 
Add sanity check to cyborg _onclick.
 2019-12-21 14:29:55 -05:00
Verkister
adc1eb2cf6 Fixes resizing for icons taller than 32p 
-Taller icons no longer sink into the tile below on the resize mechanics.
-Living mobs now have a var (vis_height) for their icon height, and humanmob species have a new var (icon_height) that overrides the vis_height for the resize proc.
-Also earlyports some tweaks to ambient occlusion. The new filter system took the old filter's settings as "make the shadows megathick and dummy intense" and that was ugly.
 2019-12-21 18:35:45 +02:00
Sebbe
a2a19321c9 Ace changes 2019-12-20 10:31:17 +01:00
Novacat
cd62e018a6 Merge pull request #6345 from VOREStation/upstream-merge-6576 
[MIRROR] Moves custom books to main repo.
 2019-12-20 01:15:23 -05:00
Novacat
bf70c3ec3b Update configuration.dm 2019-12-20 01:14:31 -05:00
Novacat
9a716ad431 Merge pull request #6343 from VOREStation/upstream-merge-6577 
[MIRROR] Examining power cells state their name and size
 2019-12-20 01:12:20 -05:00
Schnayy
9c6881148e Moves custom books to main repo. (#6576) 
* Moves custom books to main repo.

* Fixes some oopsie woopsies.
 2019-12-20 01:04:47 -05:00
Atermonera
0111815165 Buffs radiation so it isn't defeated by a thin sheet of lead. 2019-12-20 00:51:06 -05:00
Atermonera
78f32303a5 Examining power cells state their name and size (#6577) 2019-12-20 00:45:43 -05:00
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Spades
ec6ecb13ae Merge pull request #6303 from Novacat/nova-basicfixes 
Minor bug fixes
 2019-12-19 22:22:09 -05:00
TheFurryFeline
1658258d47 Merge remote-tracking branch 'upstream/master' into TFF-Seed_Vendor-Brig_Version 2019-12-19 20:26:57 -05:00
TheFurryFeline
5d46a6290d Brig Safety Lessons 
Changes the vendors in the brig to not have size changing stuff or syringes.

Changelog Notes:

- Removes syringes from Nutrimax.

- Removes grow/shrink shrooms from seed storages.

Note: Do not merge this until after my prior map PR is merged and I've dealt with the conflicts. This change is so minor that resolutions of said conflicts will be speedy.
 2019-12-19 18:51:47 -05:00
Meghan-Rossi
6530bc2e9f Merge remote-tracking branch 'origin/master' into prybars 2019-12-19 20:52:03 +00:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Novacat
af3939477f Merge pull request #6326 from VOREStation/upstream-merge-6520 
[MIRROR] Clean up dead code obsoleted by outfit system
 2019-12-19 15:46:48 -05:00
TheFurryFeline
82e5064e11 Mimic Grammar. 
Fixes extra "the"'s.
 2019-12-19 13:57:35 -05:00
Meghan-Rossi
f59e2811e3 Merge branch 'upstream-merge-6520' into prybars 2019-12-19 18:47:49 +00:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00