cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,065 Commits 10 Branches 0 Tags
3bd672954d8de2c60a3b7665d8567b8045d1f54d
Commit Graph

28130 Commits

Author SHA1 Message Date
Ketrai
c2dd08a0c8 Welcome to the mess that's my copy and paste 2017-08-28 22:41:34 +02:00
Ketrai
a627e5053e fixes indentation 
Lessons learnt, frijnnghh
 2017-08-28 22:41:01 +02:00
Ketrai
15d978ba1c indentation is evil 
Beware of copy-pasting code fuck
 2017-08-28 22:39:32 +02:00
Ketrai
bcccf8e6f8 attempts fixing primal cubes again 2017-08-28 22:34:36 +02:00
Ketrai
f03b7a3e38 Fixes snack_vr dm for primal additions 2017-08-28 22:17:56 +02:00
Ketrai
8c0b06fc39 Adds the cubes themselves for the monkeys 
as the titles says
 2017-08-28 21:38:55 +02:00
Ketrai
035ce3a7a6 adds primal boxes 
yada yada adds those 4 monkeys in boxes
 2017-08-28 21:37:21 +02:00
Ketrai
b6a288fcf4 Adds 4 new crates for 4 new monkey cubes 
Basically the same as the pull I did a moment ago.
 2017-08-28 21:33:42 +02:00
Cameron653
45edf4cb02 Update autotransfer.dm 2017-08-27 19:42:59 -04:00
Cameron653
d896a030f8 Adds global announcemment 2017-08-27 19:31:23 -04:00
Anewbe
0c89df05f6 Should make prometheans playable 2017-08-27 14:24:47 -05:00
Anewbe
e365fc5a3f Merge pull request #3726 from Woodratt/WR_Floortile_stuff 
Woodrat breaks everything with floor decals
 2017-08-27 15:13:20 -04:00
Verkister
bbc2a5cf9b More backup backup checks to maybe finally make sure only on-turf objects may fall down 
Onsite edit because fuck this. I had it fixed and working before.
NO BAD Z-HOLE. NO EATING SHIT OFF HANDS AND FOLKS YOU BAD. ONLY FLOOR FOOD FOR YOU
 2017-08-27 16:18:40 +03:00
Spades
ebf19958a3 Merge pull request #2064 from Cameron653/KETRAI_CUSTOM_ITEM 
Ketrai custom item
 2017-08-27 03:36:42 -04:00
Spades
4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00
Spades
229431bd4d Oh sure you compile fine but Travis cries 2017-08-27 01:49:41 -04:00
Neerti
b80e2ff9bc Merge pull request #3736 from MisterLayne/8/25/2017_fixes_solar_computer 
~Solar Computer Fix~
 2017-08-27 01:32:56 -04:00
killer653
55a9cf7de9 Correct way. 2017-08-26 22:50:11 -04:00
Cameron653
db875f67ec Update autotransfer.dm 2017-08-26 22:39:25 -04:00
Cameron653
3b5648282d Update custom_items_vr.dm 2017-08-26 20:02:25 -04:00
Cameron653
4d8d327284 Update custom_items_vr.dm 2017-08-26 19:48:10 -04:00
Cameron653
63cc4489b1 Update custom_items_vr.dm 2017-08-26 19:33:55 -04:00
Cameron653
0db9b961ec Update custom_items_vr.dm 2017-08-26 19:20:00 -04:00
MagmaRam
e370d56656 Merge pull request #3710 from SpadesNeil/window-change 
Weak attacks no longer can damage windows
 2017-08-26 13:55:36 -06:00
Spades
df37726669 Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed 2017-08-26 15:51:47 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
MagmaRam
3c99907484 Merge pull request #3733 from Belsima/tiedye 
Adds a tiedye shirt.
 2017-08-25 19:46:56 -06:00
MisterLayne
0a232698b1 Fixes the problem with the solar control computers where they were not fixable if they were destroyed and the glass was removed. 2017-08-25 16:42:57 -04:00
Verkister
73f450465f Makes vore organ transfer use the target organ's sound. 
-Ye it's no longer hardlimited to squish2.ogg
 2017-08-25 16:04:01 +03:00
Spades
cc6e0ce96b Merge pull request #2058 from VOREStation/WING_DESIGNER_FIX 
Should fix designer tails being unselectable.
 2017-08-25 01:24:21 -04:00
Spades
668078ed08 Merge pull request #2054 from Verkister/spampanels 
Auto-updates for vore panel and borgo gut UI.
 2017-08-25 01:24:10 -04:00
Spades
105cd5e37a Merge pull request #2046 from Ketrai/master 
Updated stolen supplies
 2017-08-25 01:23:27 -04:00
Spades
26d52b576a Merge pull request #2026 from Gearshy/master 
Shock collars now come with exciting shocking action!
 2017-08-25 01:23:11 -04:00
Spades
a43c1d408c Merge pull request #2037 from Cameron653/master 
Adds Xenneth custom ID.
 2017-08-25 01:23:01 -04:00
Cameron653
947b38a7f1 Should fix the wings 2017-08-24 22:43:55 -04:00
Neerti
289ebba13e Merge pull request #3730 from Belsima/click 
Adds more click sounds to the game.
 2017-08-24 17:34:22 -04:00
Verkister
f846437db5 I think I figured out the shuttle issue. 
-No, the line 84 did not replace or relate to the timer part you commented out.
-Due to condition mismatch of some sort, the code skipped the line 84 stuff, moving onto the next thing below, slapping the shuttle through instantly because of the timer having been commented out
 2017-08-24 21:23:39 +03:00
Verkister
20e2b78963 Proper shutdown for borgo refreshing. 2017-08-24 15:56:52 +03:00
MagmaRam
a99cf12243 Merge pull request #3729 from Belsima/master 
Adds Teshari sneezing sounds.
 2017-08-24 05:06:52 -06:00
Verkister
1d266509ae Auto-updates for vore panel and borgo gut UI. 
-Vore panel now automatically refreshes when belly contents enter or leave.
-Updates only happen when the panel is open.
-Should also work from the prey's perspective.
-Borgo sleeper UI also does that now.
-Clicking the borgo gut while active toggles the UI updates.
-Hacky shit lmao but I need to pass out again like 2 hours ago so goodnight.
 2017-08-24 02:46:57 +03:00
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
Belsima
5268f21321 Adds more click sounds to the game. 2017-08-23 03:16:21 -04:00
Belsima
a11bc0b9db Adds Teshari sneezing noises. 2017-08-23 03:08:10 -04:00
Neerti
f5f298483a Merge pull request #3725 from MagmaRam/tesla_relay 
Tesla relays will no longer draw power from the local APC when their …
 2017-08-22 17:50:34 -04:00
Anewbe
4745ce0aa4 Merge pull request #3706 from SpadesNeil/removes-hardsuit-lettering 
Removes hardsuit descriptions that name the station.
 2017-08-22 17:17:25 -04:00
Ketrai
4546f5cc9a Updated contraband crate 
Added the contraband you can get from trash piles, re-added phazon pieces.
 2017-08-22 23:00:43 +02:00
Ketrai
20250d76e1 Updated stolen supplies 
Removes the majority of phazon pieces. (getting the full set has an extremely tiny number of succeeding, and you can't get the circuit board anyways. I kept one so people know it still exists.) Adds high tier contraband you can find in trash piles to give an alternative way to obtain these. Hopefully encourages more people to mine to get points and resources for science. If you feel this isn't balanced enough, can always increase the probability of getting cosmetic or lesser items to dilute the pool.
 2017-08-22 13:13:57 +02:00
MagmaRam
3dae4b1a75 Merge pull request #3715 from Belsima/readyup 
Replaces status frame sprite.
 2017-08-21 18:47:37 -06:00
Woodratt
10c8586db0 Rough port of 
a8c9bb786a

Unsure if I even did it correctly, but seems to function in the brief tests done, no compile errors.

In preparation of porting the massive number of floor decals for the new map.
 2017-08-21 14:44:25 -07:00
MagmaRam
499f29354a Merge pull request #3716 from Belsima/zipper 
MORE ZIPPOS
 2017-08-21 13:27:12 -06:00