cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
22204 Commits
Author SHA1 Message Date
Nadyr 3b7630259c Introducing matcha! 
-Adds matcha, matcha powder, and matcha latte reagents
-Adds recipe to microwave a steamed tea leaf to get tencha then use a knife to devein and obtain matcha
-Adds matcha latte to the coffee dispenser, also makes the new cartridge available in the coffee dispenser refill crate
-Fixes grammatical issues with tea
-Removes teamush added when steaming tea leaves
-Adds matcha ice cream
-Adds icons for new objects
 2019-04-12 05:59:48 -05:00
VollyballyandGitHub cb7b5c1918 Merge pull request #625 from Razgriz1032/Razgriz1032-Mochtroid-fix 
Mochtroid icon code fix
 2019-04-12 00:52:28 -04:00
RazgrizandGitHub f528101746 Mochtroid icon code fix 2019-04-11 21:33:55 -07:00
VollyballyandGitHub ddb2ddd349 Merge pull request #621 from Razgriz1032/Razgriz1032-Electric-Spider-MovenShoot2 
Electric spider Move_Shoot fix
 2019-04-11 13:11:39 -04:00
RazgrizandGitHub 0d8c6e91df MoveAndShoot optimization 
Added if statements to state 3 and 4 of the mob's states so that it won't run the MoveAndShoot() proc unless the mob's move_shoot var is true.
 2019-04-09 18:56:06 -07:00
RazgrizandGitHub 313ced5c6c Move_Shoot fix 
Changed move_shoot from 0 to 1
 2019-04-09 18:52:40 -07:00
VollyballyandGitHub f23cca17b1 Merge pull request #617 from Sharkmare/patch-72 
Restructure of power trans code for drones.
 2019-04-09 13:25:44 -04:00
VollyballyandGitHub 9894bb2df1 Merge pull request #618 from Sharkmare/patch-73 
Code for a Chaos Size Gun
 2019-04-09 13:23:40 -04:00
VollyballyandGitHub b548933b41 Merge pull request #619 from Sharkmare/patch-74 
Recoil knockdown code for micros
 2019-04-09 13:21:50 -04:00
SharkmareandGitHub 2194256b47 Recoil knockdown code for micros 
Code to make anyone under 50% take recoil damage (5 brute - your size * 2; so at 50% thats 5-1)
Also makes tinies fall down from firing guns.
 2019-04-09 15:13:51 +02:00
SharkmareandGitHub ac891839cb Code for a Chaos Size Gun 
An `advanced` size gun, the dial and screws are a bit loose tho.
Might've been modded slightly by less than trustworthy people, 
But hey at least it no longer uses as much power per shot!
 2019-04-09 14:00:19 +02:00
SharkmareandGitHub 0f7f8e2d98 Restructure of power trans code for drones. 2019-04-09 13:17:14 +02:00
SharkmareandGitHub 531416b062 Fixing Synx Vorecode 
They should now properly be healed by twice the digestion damage they take.
Since it now directly applies to their specific damage pools they should automatically clamp to 0 so overhealing should not be an issue..
 2019-04-09 13:02:05 +02:00
VollyballyandGitHub b681f4de43 Merge pull request #606 from Razgriz1032/Razgriz1032-Metroid-Sprites-and-Code-1 
Metroid sprites and code
 2019-04-09 00:07:14 -04:00
RazgrizandGitHub cbba953ae1 Update metroidsSimple.dm 2019-04-08 18:24:05 -07:00
VollyballyandGitHub 52b1f97241 Merge pull request #609 from Razgriz1032/Razgriz1032-Lizardman-hands 
Lizardman hands
 2019-04-08 18:55:20 -04:00
VollyballyandGitHub 56294861c9 Merge pull request #612 from TheFurryFeline/TFF-The_Bigger_The_Better 
The Bigger, The Better
 2019-04-08 18:54:46 -04:00
TheFurryFelineandGitHub a7bc16a255 Size Prefs 2019-04-08 11:24:19 -04:00
TheFurryFelineandGitHub a5dc6e65ad Add New Module to Protolathe 
Last commit was **adding*** the module to the possible ones for borgs. This one is the one that adds the printable module to the Protolathe.
 2019-04-08 11:21:41 -04:00
RazgrizandGitHub ba26d4d786 Lizardman hands 
They now have hands if a player is assigned to play as a lizardman.
 2019-04-07 20:35:02 -07:00
VollyballyandGitHub 8ba25344f5 Merge pull request #608 from Razgriz1032/Razgriz1032-Solargrub-evolution-time-increased 
Increased Solargrub evolution time
 2019-04-07 23:32:13 -04:00
RazgrizandGitHub f763d05f59 Increased Solargrub evolution time 
Changed required evolution charge from 16000 to 32000.
Changed evolution probability from 2% to 1%.

Originally it would take about maybe 7 minutes for a grub to evolve. Should take more than double that now.
 2019-04-07 20:14:00 -07:00
VollyballyandGitHub aa51201412 Merge pull request #604 from Razgriz1032/Razgriz1032-Electric-Spider-MoveNShoot 
Electric Spider move and shoot
 2019-04-07 23:05:46 -04:00
VollyballyandGitHub 3e50515d56 Merge pull request #605 from Razgriz1032/Razgriz1032-Moth-Health-Nerf 
Solarmoth health and armor nerf
 2019-04-07 22:49:02 -04:00
RazgrizandGitHub 39d55924ca Metroid progress 
Changed the minetroid to be the sprite of a mochtroid. Metroid evolutions up to Gamma are in. Gamme features not complete. Final stats on all metroids (except the mochtroid) are not complete. Please do not use them yet.
 2019-04-07 19:42:08 -07:00
RazgrizandGitHub e98b6b9c34 Update giant_spider.dm 2019-04-07 19:35:07 -07:00
VollyballyandGitHub fdf76946ee Merge pull request #599 from Sharkmare/patch-69 
Adding sizecheck to edible code
 2019-04-07 22:34:22 -04:00
VollyballyandGitHub fb9000d63c Merge pull request #600 from TheFurryFeline/patch-11 
Port Flag Fix
 2019-04-07 22:33:21 -04:00
VollyballyandGitHub e0bd967c99 Merge pull request #601 from TheFurryFeline/patch-12 
PDA Unlock Borg Fix
 2019-04-07 22:32:56 -04:00
RazgrizandGitHub a8e89ab291 Solarmoth health and armor nerf 
Health reduced to 400 from 500.
Melee armor reduced from 50% to 0%.
 2019-04-07 19:30:11 -07:00
RazgrizandGitHub 033ab5da1d Electric Spider move and shoot 
+Electric spiders now move and shoot at the same time so that if they do manage to down someone, they'll give the poor bastard a mercy killing instead of perpetual stunlocking.
+Nerfed taser fire rate to once every 15 seconds, up from 10. Because frak electric spiders.
 2019-04-07 19:23:00 -07:00
RazgrizandGitHub 3e98f5b6f9 Moving and Shooting 
Added a new variable and some code to make it so that mobs can move and shoot at the same time. New variable:
var/move_shoot = 0
If you want a ranged mob to do this, you must turn its variable "ranged" to 0 and add "move_shoot" and set it to 1.
In other words, "ranged" will override move_shoot. Ranged basically turns you mob into a turret.
 2019-04-07 19:12:09 -07:00
TheFurryFelineandGitHub dfc1d730ab PDA Unlock Borg Fix 
Ports https://github.com/VOREStation/VOREStation/pull/4950
 2019-04-07 21:48:36 -04:00
TheFurryFelineandGitHub 05f5bf7743 Port Flag Fix 
Seems that there was an issue with these that was never noticed, so porting https://github.com/VOREStation/VOREStation/pull/4948 over.
 2019-04-07 21:48:32 -04:00
SharkmareandGitHub ca1ef9672d Update belly_obj_vr.dm 2019-04-07 17:07:23 +02:00
SharkmareandGitHub 66654ec03e Adding sizecheck to edible code 
While a full sized deathclaw can smack your ass down, a shrunk deathclaw shouldnt be able to, lets reflect that in code.
 2019-04-07 16:47:30 +02:00
VollyballyandGitHub c9f587898a Merge pull request #594 from Darlantanis/RetrowaveTeshCloak 
Retrowave teshari cloak
 2019-04-05 21:32:30 -04:00
VollyballyandGitHub 2ed4c0fcff Merge pull request #595 from Sharkmare/patch-68 
Minor Solarmoth maintenance
 2019-04-05 21:32:19 -04:00
VollyballyandGitHub 62d5233fff Merge pull request #596 from TheFurryFeline/TFF-Minor_Map_Changes 
Minor Map Changes
 2019-04-05 21:19:49 -04:00
TheFurryFelineandGitHub a3e73923d8 Enable Elevator Spawnpoints 
You'll be able to spawn into the round at the Elevator now.
 2019-04-05 18:02:20 -04:00
SharkmareandGitHub 484f837b5b Update solarmoth.dm 2019-04-05 16:21:10 +02:00
SharkmareandGitHub 1ce588539f Minor Solarmoth maintenance 
Solarmoth attacks should now handle properly.
Made a few vars to keep track of starting heat power.

Lunarmoths.
These ones aren't so simple
 2019-04-05 15:14:45 +02:00
Nadyr d834358d7c -Added 'dark aesthetic' retrowave teshari cloak 
-Added sprites for said cloak
-Added cloak to the black teshari cloaks supply pack
 2019-04-04 19:45:17 -05:00
VollyballyandGitHub 10877f05b5 Merge pull request #592 from Shandriaa/master 
New Drink: Hachi
 2019-04-04 19:43:55 -04:00
AnonymousHybiandGitHub 75b0037a00 Fixes compile error 
Missing an " ^^
 2019-04-04 23:47:50 +01:00
ShandriaaandGitHub 575193cf32 Update price_list.dm 2019-04-04 17:16:19 -05:00
ShandriaaandGitHub fa301acd78 Update metaglass.dm 2019-04-04 17:13:47 -05:00
ShandriaaandGitHub f784b8c08e Update Chemistry-Reagents-Food-Drinks.dm 2019-04-04 16:59:20 -05:00
ShandriaaandGitHub 075766d674 Update Chemistry-Recipes.dm 2019-04-04 16:38:23 -05:00
SharkmareandGitHub 38341510f9 Update simple_animal.dm 2019-04-04 22:33:06 +02:00