cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,525 Commits 13 Branches 0 Tags
3bc058624e61b39112e6645c3b550c2a9fa3a3bc
Commit Graph
42633 Commits
Author SHA1 Message Date
cadynandGitHub 3bc058624e Merge branch 'master' into Precursorpewpew 2021-02-04 20:49:25 -08:00
Sym 2d641fed65 Adds Precursor Projectile for alien guns 
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
 2021-02-04 23:15:51 -05:00
RazgrizandGitHub 8bf292d9c5 Merge pull request #1235 from Shadowfire117/ExtraMas 
quick fix
 2021-02-04 14:25:21 -07:00
Shadowfire e0f0261727 quick fix 
spelling errors, bleh
 2021-02-04 21:30:10 +01:00
cadynandGitHub 6e569ca7de Merge pull request #1209 from MisterGrimm/GammaJamma 
Adds the GA-X Experimental Gamma Laser for mechs
 2021-02-03 13:16:02 -08:00
cadynandGitHub 92b4eb2fd8 Merge pull request #1200 from LuciusWorna/master 
Energy Weapons Rebalance and Misc Fixes
 2021-02-03 13:15:50 -08:00
RazgrizandGitHub e15b227727 Merge pull request #1231 from CHOMPStationBot/upstream-merge-9639 
[MIRROR] Fixes nontaur clipping
 2021-02-03 09:56:24 -07:00
RazgrizandGitHub 4a1a88f779 Merge pull request #1228 from CHOMPStation2/Razgriz1032-patch-13 
Add gear harness to the General Jump
 2021-02-03 09:55:23 -07:00
RazgrizandGitHub 02b4e274ce Merge pull request #1232 from Shadowfire117/ExtraMas 
Shadyboi
 2021-02-03 09:54:49 -07:00
Shadowfire 6716f5a01d Shadyboi 
Redacted
 2021-02-03 17:37:07 +01:00
NovacatandChompstation Bot a90aecfd90 Merge pull request #9639 from VOREStation/Verkister-patch-8 
Fixes nontaur clipping
 2021-02-03 14:40:17 +00:00
RazgrizandGitHub 01e9a9a0ea Merge pull request #1227 from CHOMPStationBot/upstream-merge-9637 
[MIRROR] Disables egg contamination
 2021-02-02 20:54:54 -07:00
RazgrizandGitHub 8157fd7dd5 Merge pull request #1221 from CHOMPStationBot/upstream-merge-9622 
[MIRROR] New advanced Egg Release mechanics.
 2021-02-02 20:54:35 -07:00
RazgrizandGitHub 725a606759 Add gear harness to the General Jump 
My fetish for harnesses cannot be denied
 2021-02-02 20:29:37 -07:00
NovacatandChompstation Bot e047e9f98c Merge pull request #9637 from VOREStation/Verkister-patch-6 
Disables egg contamination
 2021-02-03 02:17:13 +00:00
NadyrandGitHub 2b1b88b98b Merge pull request #1219 from CHOMPStationBot/upstream-merge-9629 
[MIRROR] Shuttle Console ID Stuff
 2021-02-02 03:16:00 -05:00
RazgrizandGitHub bf259c4809 Merge pull request #1216 from Darlantanis/StarFireReportUpdate014-2565 
Starfire Update 014 2565
 2021-02-01 18:52:27 -07:00
RazgrizandGitHub 505a6e1e7d Merge pull request #1217 from CHOMPStationBot/upstream-merge-9628 
[MIRROR] Includes subtles in Local Chat vchat filter
 2021-02-01 18:51:38 -07:00
RazgrizandGitHub 593e335070 Merge pull request #1218 from CHOMPStationBot/upstream-merge-9626 
[MIRROR] Fixes station shieldgen icon jank (supposedly)
 2021-02-01 18:51:00 -07:00
RazgrizandGitHub e414b036ab Fix conflict and adds chomp comments to vorespawn_blacklist 2021-02-01 18:45:13 -07:00
RazgrizandGitHub 12828949ab Fix number of peeps transfered 
Appended /centcom to the escape shuttle again to fix transfer message. Added some escape pods to the list.
 2021-02-01 18:37:06 -07:00
Chompstation Bot d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
NovacatandChompstation Bot 3d5c11d6df Merge pull request #9629 from Novacat/nova-basicfixes 
Shuttle Console ID Stuff
 2021-02-01 03:25:27 +00:00
NovacatandChompstation Bot 5509d68b91 Merge pull request #9626 from Verkister/shieldgenie 
Fixes station shieldgen icon jank (supposedly)
 2021-01-31 15:54:49 +00:00
NovacatandChompstation Bot 2de1f5aef0 Merge pull request #9628 from Cyantime/patch-5 
Includes subtles in Local Chat vchat filter
 2021-01-31 15:53:40 +00:00
Darlantan 5a588c5d99 News Update 2021-01-31 03:12:19 -05:00
RazgrizandGitHub 710c6b5021 Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615 
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
 2021-01-30 00:20:38 -07:00
cadyn c86326e7a5 Fix stuff and give name 2021-01-29 21:46:00 -08:00
cadynandGitHub 439b0a4e85 Merge pull request #1211 from CHOMPStation2/cadyn-patch-6 
Give Asset protection rigsuit thermal protection
 2021-01-29 20:30:22 -08:00
cadyn 1aa0df2c2a fixing lasers yeeting through mobs 2021-01-29 20:12:38 -08:00
cadynandGitHub 533d307d99 Also add antiareli suits 2021-01-29 17:02:13 -08:00
cadynandGitHub 55376d92af Give Asset protection rigsuit thermal protection 
Asset protection is supposed to win anyways lol
 2021-01-29 16:58:51 -08:00
cadynandGitHub 02a5bbd8fc Merge pull request #1210 from cadyn/eventstuffuwu 
Adding telecrystal stuff for event
 2021-01-29 16:01:14 -08:00
Sym 6edff03a2e Remove a comment 
Thats alot of balance
 2021-01-29 18:50:07 -05:00
cadyn ce65236cec Adding telecrystal stack spawners 2021-01-29 15:39:20 -08:00
cadyn bcfdb424c2 Adding telecrystal stuff for event 2021-01-29 15:13:52 -08:00
Sym 9739b67368 Balance buff 
Hurt me more baby
 2021-01-29 16:18:48 -05:00
Sym 55a6523bc0 Adds Gamma Laser for mech, tweaks gamma laser 
Tweaking Gamma Laser projectile to be used in mech weapon
 2021-01-29 15:04:36 -05:00
Shadow Quill 636278b1ac Adds EFTPOS scanners to security/warden lockers, and a few items as well 2021-01-28 20:22:21 -06:00
cadynandGitHub 9576d1270d Update world.dm 2021-01-27 22:33:24 -08:00
RazgrizandGitHub b7d964f87a Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604 
[MIRROR] [MIRROR] Mech Appearance Update
 2021-01-27 18:58:35 -07:00
RazgrizandGitHub 4fb89f93d5 Merge pull request #1194 from Sharkmare/Circuitry-fix 
Fixes input pads and adds ?:
 2021-01-27 18:44:29 -07:00
RazgrizandGitHub 99d137254d Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614 
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 18:43:55 -07:00
RazgrizandGitHub 7220f8fbbc Merge pull request #1202 from CHOMPStationBot/upstream-merge-9619 
[MIRROR] [MIRROR] Fixes sif forest grass, adds overgrowth tiles
 2021-01-27 18:43:34 -07:00
RazgrizandGitHub 13187c605c Update morph_spawn_vr.dm 2021-01-27 18:40:33 -07:00
RazgrizandGitHub 2c2f10c9d4 Update grass.dm 2021-01-27 18:14:16 -07:00
RazgrizandGitHub f97d065119 Update tile_types.dm 2021-01-27 18:13:46 -07:00
RazgrizandGitHub 8f0f6f804b Update fifty_spawner_tiles.dm 2021-01-27 18:13:25 -07:00
RazgrizandGitHub a0cf35dc49 Merge pull request #1204 from cadyn/attacklogsql 
Porting attack logs to use SQL
 2021-01-27 18:12:18 -07:00
RazgrizandGitHub 5bfa8593db Merge pull request #1203 from CHOMPStationBot/upstream-merge-9618 
[MIRROR] Some minor fixes
 2021-01-27 18:11:47 -07:00