cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 16:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,062 Commits 8 Branches 0 Tags
1d19289ef97d516482c51f5fb3d84df41306f2d3
Commit Graph

24253 Commits

Author SHA1 Message Date
Razgriz
9f5d08e96a Merge pull request #104 from MrMacint0sh/master 
Commenting is Key when it comes to Fat Taurs. Also a Bugfix.
 2020-01-08 23:31:44 -07:00
TheFurryFeline
1da9b43963 Re-revert's Removal of Headsits. 
Title.

Changelog Notes:

- Reverts removal of https://github.com/VOREStation/VOREStation/pull/5581 by YW. Comments adjusted accordingly.
 2020-01-08 21:32:14 -05:00
Mack
3babf30a7b Adding CHOMP Comments for easier locating. 2020-01-08 15:41:38 -05:00
Mack
66a8108bf4 Updated comments 2020-01-08 15:36:27 -05:00
Mack
88aa4b7c04 Deleting dm.orig file, unneeded, as per TheFurryFeline's Request 2020-01-08 11:29:23 -05:00
Mack
8996a7dda8 Fixing Fat Wolf Taur 
Fixed up some code discrepancies that stopped a person with the single color fat taur body from using the Duty Taur Vest.
 2020-01-08 11:28:40 -05:00
Razgriz
08d3cda868 Merge pull request #81 from Shadow-Quill/patch-1 
Removes ball-kicking
 2020-01-08 03:32:21 -07:00
Razgriz
298c8b72fa Merge pull request #100 from CHOMPStation2/Sharkmare-UNI-FAB 
Re porting unified fabricators
 2020-01-08 02:04:28 -07:00
Sharkmare
0c109fcc8c Re porting unified fabricators 
This time you can set what drones they are allowed to make on the mapping side, so 1 item can be set to produce whatever drone you want mapped, meaning you can still have a unify fab that can only print mining drones. Just gotta map the tag appropriately
 2020-01-07 20:48:58 +01:00
TheFurryFeline
2806ddc4a4 Bloodsucker Plus Fixy 
Fixes a copy-pasta oversight. Also adds CS Removal comments for traits commented out here.
 2020-01-06 14:55:08 -05:00
Shadow
d1d4475150 Whoops 2020-01-06 08:51:23 -06:00
Shadow-Quill
3410f3ccbc Removes ball-kicking 2020-01-06 08:45:47 -06:00
Razgriz
95e08b3811 Merge pull request #90 from TheFurryFeline/TFF-Mining_Drones_Scanner_Hype 
Mining Drone Scanner Hype
 2020-01-06 03:39:49 -07:00
Razgriz
a7973be24a Merge pull request #85 from TheFurryFeline/patch-2 
Backport Quick-NIF Perms
 2020-01-06 03:19:58 -07:00
Razgriz
7ed9b4d06c Merge pull request #77 from MrMacint0sh/master 
Fixing Yawn Wilder Taurs
 2020-01-06 03:07:56 -07:00
Razgriz
bfefaeb669 Merge pull request #73 from Kazzc/Food 
Ported in some food items from our old code.
 2020-01-06 03:07:24 -07:00
TheFurryFeline
2b245fd831 Mining Drone Scanner Hype 
Long overdue addition for mining donres to get ore scanners.

Changelog Notes:

- Gives Mining Drones Ore Scanners as part of their modules.
 2020-01-05 15:19:29 -05:00
TheFurryFeline
d98368beb9 Add Chomp edit comment. 2020-01-04 12:50:34 -05:00
TheFurryFeline
bb74b0ea65 Backport Quick-NIF Perms 
Re-add ability for other staff to be able to quick-NIF others. Would allow testing devs to give themselves a NIF back if they lost it after a shift and so forth.
 2020-01-04 12:46:47 -05:00
Mack
4c650bf1a4 Fixing Yawn Wilder Taurs 2020-01-02 13:36:02 -05:00
Razgriz
627499393e Merge pull request #62 from Holdelta/Holdelta-BorgPetting 
Adding borg petting
 2020-01-02 06:17:33 -07:00
Kazzc
9d8084f4eb Ported in some food items from our old code. 
created three files: food_cm, recipes_microwave_cm & snacks_cm
Added food sprites for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
programmed food items for: tocino, pandenata, garlicbread, bigos, tamales & sauerkraut.
 2020-01-02 06:32:38 -06:00
Razgriz
da08830c0b Infinite feeding 2020-01-01 23:16:29 -07:00
Nadyr
d3cd4a6cde Merge pull request #66 from TheFurryFeline/TFF-Map_Fixes_Round_1 
Mapfix Palooza Round One
 2020-01-01 20:43:46 -05:00
Razgriz
db43a2cc83 Update positive.dm 2020-01-01 15:20:23 -07:00
Razgriz
5dad567067 Comment out new traits for later review 
Commenting out new traits. Needs a balance pass. However, leaving in YW added Photosensitivities. We had a photosensitivity trait on old chomp, it was 2x flash_mod, and was only -1 cost. I like the numbers here because they reflect their positive counterparts.
 2020-01-01 13:00:03 -07:00
Razgriz
ab0519d9f8 Commenting out new traits for review 
Needs a balance pass in the near future.
 2020-01-01 12:52:14 -07:00
TheFurryFeline
2754068163 More Fixes 
Brollies, T-comms access fix, body designer, Erik's Lungs
 2019-12-31 20:03:39 -05:00
Holdelta
4c9978c1b0 Update robot.dm 2019-12-30 17:13:17 -08:00
Razgriz
e8069cd7cd Whitelist fix 2019-12-30 02:36:29 -07:00
JesusChristItsJasonBourne
6a18a3e928 re-structured the re-addition of CH chems 2019-12-30 19:22:02 +10:00
JesusChristItsJasonBourne
fbfa396987 re-adds CH files for reagents 
tested ingame for functionality of 4 of the chems with full sucess, including aphrodisiac and gender changing.
 2019-12-30 18:51:21 +10:00
Razgriz
e9c8791acf Add files via upload 2019-12-29 01:58:48 -07:00
Razgriz
0aae784d23 Update event_container_vr.dm 2019-12-29 00:42:41 -07:00
Razgriz
27cd3c75bf Update event_container_vr.dm 2019-12-29 00:29:37 -07:00
Razgriz
3f1a61b23b Update event_container_vr.dm 2019-12-29 00:22:24 -07:00
Razgriz
b8781f3cb4 Update event_dynamic.dm 2019-12-29 00:03:15 -07:00
CHOMPStation2
9d5a0a5004 Remove commented rust_g code 
It seems like the code is still being read despite it not being commented out. Removing commented out code.
 2019-12-28 15:46:50 -07:00
Razgriz
c95b7040cb CH Markings 
Adds old Chompers body markings.
 2019-12-28 01:41:46 -07:00
TheFurryFeline
b616d15cb6 Shuttle Transfer, Not Tram 
Title.

Changelog Notes: 

- Makes transfer stuff show Shuttle as transfer vehicle/mode. Not the Tram.
 2019-12-28 02:37:15 -05:00
CHOMPStation2
26db1cd28c Comment out lines on rust-g 
Chomp uses rust-g for our Linux server, but what the lines did for us is not compatible, so we're just forcing the normal operation.
 2019-12-27 19:42:19 -07:00
DHA
b93f5a2fa4 ML3M and NFSW gun research removal 
Removed from science research, but they are still in the code. This is to remove them from play. Reasons for removal are too complicated to state here.
 2019-12-27 08:48:37 -08:00
Nadyr
90574aa811 Removes all new species from the choosable species list. Some may be reimplemented later pending staff discussion. Removed species: 
-Protean
-Zaddat
-Werebeast
-Alraune
-Gravhuman
-Spacehuman
-3 versions of shadekin
 2019-12-26 17:40:53 -05:00
Nadyr
4b9ecb9ac1 Merge pull request #12 from TheFurryFeline/TFF-Other_Fixies_n_Tweaks 
Fixes
 2019-12-26 14:54:53 -05:00
TheFurryFeline
44fe24cad0 Restore Loneliness Code 
Comments it all out, though. Also restoring a couple overwritten code.
 2019-12-26 13:19:32 -05:00
TheFurryFeline
dd147fc1d9 Re-Add Overwritten Code 2019-12-25 18:48:02 -05:00
TheFurryFeline
3b2b52f097 AAAAAAAAAA 2019-12-25 18:18:24 -05:00
TheFurryFeline
f209536501 Missed a Few 2019-12-25 18:17:48 -05:00
TheFurryFeline
d467f128fb Revert event_container_vr.dm Changes 
Slight placement fix of a comment pertaining solar storm event.
 2019-12-25 18:12:06 -05:00
Razgriz
1525ded30d Add files via upload 2019-12-25 04:19:14 -07:00