cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,207 Commits 6 Branches 0 Tags
f169a5f8bf86a61627c44d1d197b223ca8a23f0c
Commit Graph

45207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spades
1c92c06771 Merge pull request #4584 from Novacat/nova-heterochromia 
Replaces Ace's ammo with HP
 2018-12-14 11:29:42 -05:00
Spades
dd0a71d6b4 Merge pull request #4488 from Verkister/yeehow 
Enables riding for a bunch of animals.
 2018-12-14 11:28:32 -05:00
Unknown
32c3103f4a Removing Laptop 
Laptops kind of do not work well at the moment, so just going to remove it.
 2018-12-13 21:28:24 -05:00
Unknown
edc75369bd Fixes Travis Error 2018-12-13 21:28:24 -05:00
Unknown
85ea1387b7 Update to newest master branch 2018-12-13 21:28:24 -05:00
Unknown
5e58423b29 Fixes #4111 2018-12-13 21:28:24 -05:00
Unknown
7a22b9767c Adds Ascian's Shelter Capsule 
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
 2018-12-13 21:28:24 -05:00
Spades
e1de74a24e Merge pull request #4585 from Novacat/nova-survival 
Fixes major merge errors
 2018-12-13 19:47:31 -05:00
Verkister
447e0a8340 Fixes undefined z-levels shitting caves all over the place 
-Basically just gives the tether lateload z-levels actual z-levels and assigns them for use.
-Also moves the cave/ore generation for beach cave and V2 caves for the actual map loader instead of some awaymap temp objects that had apparently didn't have enough concept for proper z definitions.
-Fixes the forementioned things constantly bugging out and spawning all those caves and ores into the surface level foundations.

-Also fixes PoIs getting squished at least until Polaris gets their shit together with yet another submap rotation refactor.

God let me get some fucking rest fsghjasf
 2018-12-14 01:15:28 +02:00
Verkister
4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Spades
5742799f74 Restores a comment 2018-12-13 06:00:23 -05:00
Verkister
35c3443bdc Adds colorable alraune sprites and tweaks some taurgear 2018-12-13 12:17:17 +02:00
Unknown
5eac21477d This is probably a better spot 2018-12-13 00:44:34 -05:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
Unknown
a7f5702981 Fixes major merge errors 
- Readds missing APC to the third floor station
- Readds missing syringes.dm to the dme file

Considering the nature of these errors, there may be more merge errors hidden.
 2018-12-13 00:05:18 -05:00
Unknown
64fd3a11a6 Replaces Ace's ammo with HP 
Since 9mm has hollow point now.
 2018-12-12 21:53:24 -05:00
Heroman3003
4e0be86ec5 Fixes air alarms having different frequency from vents/scrubbers 2018-12-13 12:37:36 +10:00
Spades
99cc046512 Merge pull request #4580 from VOREStation/upstream-merge-5724 
[MIRROR] Added washing machine working sound
 2018-12-12 21:27:14 -05:00
Spades
38541e27f5 Merge pull request #4576 from VOREStation/upstream-merge-5767 
[MIRROR] Fixed a typo in Space Heater's cell removal message
 2018-12-12 21:27:02 -05:00
Spades
9075eb25de Merge pull request #4530 from VOREStation/upstream-merge-5643 
[MIRROR] Mech noises update.
 2018-12-12 21:25:46 -05:00
Spades
2d11272b7c Merge pull request #4528 from VOREStation/upstream-merge-5742 
[MIRROR] Changes Mech Diamond Drill Cooldown
 2018-12-12 21:25:37 -05:00
Spades
8ff334d67c Merge pull request #4526 from VOREStation/upstream-merge-5736 
[MIRROR] Fixes missing hollow point ammo for 9mm
 2018-12-12 21:25:22 -05:00
Spades
16f14eef2e Merge pull request #4525 from VOREStation/upstream-merge-5732 
[MIRROR] Added disgusting number of new names to the namelists
 2018-12-12 21:25:11 -05:00
Spades
98e542144b Merge pull request #4524 from VOREStation/upstream-merge-5715 
[MIRROR] Updates Rapid Service Fabricators.
 2018-12-12 21:25:02 -05:00
Spades
670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718 
[MIRROR] New hair + underwear
 2018-12-12 21:24:49 -05:00
Spades
e956afedbf Merge pull request #4529 from VOREStation/upstream-merge-5649 
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-12 21:24:38 -05:00
Spades
37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit 
makes the pompom uncontaminatable
 2018-12-12 21:24:11 -05:00
Spades
04c529dbad Merge pull request #4573 from Verkister/patch-28 
Fixes quitting pods not handling belly contents.
 2018-12-12 21:23:24 -05:00
Spades
56dbc1a224 Merge pull request #4572 from Novacat/nova-heterochromia 
Fixes a runtime with radio.dm
 2018-12-12 21:23:11 -05:00
Spades
531bd6a7eb Merge pull request #4562 from Verkister/patch-27 
Disables PDA contamination.
 2018-12-12 21:22:15 -05:00
Spades
850c37c598 Merge pull request #4561 from Verkister/butts 
Fixes a bunch of butts
 2018-12-12 21:21:58 -05:00
Spades
a2bf4e780f Merge pull request #4560 from Mewchild/MC-Varonis 
Adds Varonis and Oreganovulgaris to Xenochimera Whitelist
 2018-12-12 21:21:08 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -05:00
Spades
f1540d4764 Merge pull request #4547 from Mewchild/MC-Sec 
Fixes Detective Disposals
 2018-12-12 21:19:16 -05:00
Spades
261a99f6e7 Merge pull request #4546 from Screemonster/starfinder 
Adds timegate to pathfinder
 2018-12-12 21:19:03 -05:00
Spades
d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer 
Fixes some layering issues on taur/borg riding.
 2018-12-12 21:18:52 -05:00
Spades
9393a57729 Merge pull request #4545 from Novacat/nova-survival 
Sets Abduction Chance to 0
 2018-12-12 21:17:41 -05:00
Spades
1111241d7d Merge pull request #4533 from Verkister/patch-26 
Fixes digestive analyzer missing sync button
 2018-12-12 21:14:53 -05:00
Spades
eb1013486f Merge pull request #4559 from ArgobargSoup/ArgoAnimeEyeFix 
Updates anime eyes marking
 2018-12-12 21:14:33 -05:00
VirgoBot
aa2e3f3459 Added washing machine working sound 2018-12-11 16:46:36 -05:00
Atermonera
9bc49a2ca7 Merge pull request #5724 from Heroman3003/washingmachine-noise 
Added washing machine working sound
 2018-12-11 16:46:36 -05:00
Darkwolf6180
3c35eb8f45 Fixes Engineering Taur Hardsuits 
Edits the names of several taur hardsuits to be the same as used by code; IE "industrial_rig" -> "engineering_rig"
 2018-12-10 18:58:55 -06:00
VirgoBot
5c3b8aaf33 Fixed a typo in Space Heater's cell removal message 2018-12-09 23:48:35 -05:00
Neerti
89b17cece1 Merge pull request #5767 from Heroman3003/typo-heater 
Fixed a typo in Space Heater's cell removal message
 2018-12-09 23:48:35 -05:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Verkister
c07dee4df4 Some taur contrast tweaks. 
-Adjusts some taur parts for a little more consistent brightness/contrast.
-These including naga, feline, lizard, and otie.
 2018-12-09 17:57:16 +02:00
Verkister
c59ee70fe5 Fixes quitting pods not handling belly contents. 
-Basically fixes the actually visible bug of ID-containing PDAs in bellies pooping their IDs on the floor when the pred leaves by cryo/tp/tram.
 2018-12-09 13:43:33 +02:00
Unknown
a98204aa31 Fixes a runtime with radio.dm 
Load ordering was causing the access datums for explorer and pilot access to be defined after radio.dm was loaded, which caused radio.dm to look for access datums that did not exist at the time.

This causes the explorer and pilot access datums to load much earlier, fixing the runtime.
 2018-12-09 01:55:46 -05:00
Zap-zapper
e7ae902098 Moving code from normal files to lewd files 2018-12-09 09:47:07 +07:00
Spades
5fe51f64ad Merge pull request #4507 from Verkister/patch-25 
Fixes ingested organs giving way too much fat
 2018-12-08 21:14:38 -05:00