cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 08:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,997 Commits 9 Branches 0 Tags
bfefaeb669c214dfa0d51c3d21906a71d3e1c19a
Commit Graph

24234 Commits

Author SHA1 Message Date
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
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
Razgriz
8968f6f527 Add files via upload 2019-12-25 04:18:45 -07:00
Razgriz
62bc00aac2 Add files via upload 2019-12-25 04:18:18 -07:00
TheFurryFeline
78cafd9421 Fixes 
Changelog Notes:

- Removes wikilinks for species.

- Removes lonilness trait for Teshari.

- Re-syncs events list with Chompers v1's current, comments out those not coded in quite yet for later.
 2019-12-24 15:24:06 -05:00
TheFurryFeline
724ca28fc0 We Are Chompers! 
Changelog Notes:

- Fixes welcome image, its displayed name on the bottom.

- Fixes window title name.

- Comments out unneeded stuff about YW and Virgo in global.dm.
 2019-12-24 14:00:43 -05:00
Nadyr
1a918c209d Sets icon override to use teshari sprites when ponchos are worn by teshari. Otherwise it just uses ties.dmi as normal. 2019-12-21 01:59:21 -05:00
RadiantFlash7
4bf53cacde Heckin, fixed my notations ;-; 
Rude host, making me be a proper coder and not suck.
 2019-12-14 23:54:05 -05:00
RadiantFlash7
2216d15f6a deliniates changes of YW in non YW files 
Fixes some more map stuff.
 2019-12-14 23:40:22 -05:00
RadiantFlash7
3b5974d125 Release day fixes 
Release day fixes!
Event disables/added stuff,
Tons of map issues fixed.
 2019-12-14 23:09:31 -05:00
RadiantFlash7
64e7b88c4a Adds airlocknotice 
Adds airlock notice, and last minute map touchups to make it feel like a recently purchased and rennovated station.
 2019-12-14 11:53:40 -05:00
RadiantFlash7
c98003a013 Fixes wine vats and all errors from travis 
Fixes wine vats and all errors from travis
 2019-12-12 18:41:21 -05:00
RadiantFlash7
ae3f109ae1 load order fix& typos. 
Fixes minor typos and load order for the job outfits datums.
 2019-12-09 18:56:10 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Repede
0159234240 Fixes outdoor platings 
Phororeagent fixes
 2019-12-09 12:04:41 -05:00
RadiantFlash7
2348fed664 More fixes. 
Fixes for the map.
Fixes turfs, cameras, access issues, and a few more things.
 2019-12-08 18:32:45 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
RadiantFlash7
3fc8f433bc Play Test fixes 
Fixes every single bug in the playtest so far.
 2019-12-08 11:33:54 -05:00
Repede
f9688aea70 Edgyness increase 2019-12-08 01:12:17 -05:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Unknown
d92e151dab Fixes typo name 2019-12-06 19:32:35 -05:00