cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 14:23:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,849 Commits 8 Branches 0 Tags
49ae612dc450f408da97f4a67e2c686a1fdbef02
Commit Graph

42214 Commits

Author SHA1 Message Date
Cadyn
49ae612dc4 Maybe forgot this 2020-11-25 19:44:55 -08:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00
cadyn
21acd90c21 If the fixes the lag I will cry 2020-11-24 15:34:02 -08:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
Razgriz
d9a05b87cc Merge pull request #916 from CHOMPStation2/RazgrizBranch1 
Beepsky ignore certain guns
 2020-11-24 03:03:03 -07:00
Razgriz
83694b7f50 Merge pull request #914 from CHOMPStation2/Razgriz1032-patch-8 
Remove shit opinion
 2020-11-24 03:02:03 -07:00
Razgriz
17ceac5017 Missing ) 2020-11-24 02:19:24 -07:00
Razgriz
85ace9258d Add lasertag weapons to the list 2020-11-24 02:17:06 -07:00
Razgriz
f0ed6e20ea Beepsky ignore certain guns 
Ignores size gun, flora gun, and confetti cannon
 2020-11-24 01:41:46 -07:00
Razgriz
65e67665c4 Merge pull request #911 from CHOMPStation2/RazgrizBranch1 
Spear and Gun sizes
 2020-11-24 01:22:41 -07:00
Razgriz
734e5d532a Remove shit opinion 
Removed a stanza that prevented some flexibility with the digestion for mobs, and also the returned comment was highly unprofessional.
You can now toggle the digestion mode on simple animals. You will be warned that using this to break OOC prefs is against the rules before doing so. Right click the mob and toggle their digestion.

It's VORE it's not meant to be balanced anyway.
 2020-11-24 00:16:18 -07:00
Razgriz
82c3e60ea3 Tweak metroid event weight 
It was too high.
 2020-11-23 22:09:58 -07:00
Razgriz
75def0a44a Merge pull request #906 from CHOMPStationBot/upstream-merge-9348 
[MIRROR] Spellcheck the tummy text
 2020-11-23 20:47:33 -07:00
Razgriz
f0ace37d4f Spear and Gun sizes 
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
 2020-11-23 19:29:48 -07:00
Novacat
8abfb52a6c Merge pull request #9348 from Very-Soft/spellcheckwoofs 
Spellcheck the tummy text
 2020-11-23 18:33:18 +00:00
Novacat
c97fc22813 Merge pull request #9346 from ShadowLarkens/patch-1 
Fix #9345
 2020-11-23 15:22:27 +00:00
Razgriz
a34cc7a91c Merge pull request #901 from CHOMPStationBot/upstream-merge-9342 
[MIRROR] Removes prompt for ID restoration if no ID
 2020-11-22 23:35:29 -07:00
Razgriz
3b9a4407df Merge pull request #900 from CHOMPStationBot/upstream-merge-9339 
[MIRROR] Fixes digested PDAs dropping IDs on the floor
 2020-11-22 23:35:13 -07:00
cadyn
2b0359656c Merge pull request #902 from cadyn/optimize-telecomms 
Finally optimize radios
 2020-11-22 21:57:22 -08:00
Razgriz
f5927ffd21 Update metTypes.dm 2020-11-22 22:49:35 -07:00
cadyn
7626117811 I forgot to delete these oops 2020-11-22 21:43:20 -08:00
cadyn
8f8caeb621 one more lil sneaky chompedit tag 2020-11-22 21:28:41 -08:00
cadyn
c55132d06d Finally optimize radios 2020-11-22 21:20:05 -08:00
Novacat
b21a069c83 Merge pull request #9342 from Shadow-Quill/IDRestoreEarlyReturn 
Removes prompt for ID restoration if no ID
 2020-11-23 04:56:04 +00:00
Novacat
35d97e041c Merge pull request #9339 from VOREStation/Verkister-patch-5 
Fixes digested PDAs dropping IDs on the floor
 2020-11-23 04:55:57 +00:00
Razgriz
fd3fe0378f QUICK FIX 
Hopefully to get jellybrig to retaliate
 2020-11-22 16:56:26 -07:00
Razgriz
6d9a342c0c Access Teleporter, again 
Was supposed to be granted by #512 but was accidentally removed when restoring security permissions for HoS in another PR.
 2020-11-22 16:24:19 -07:00
Razgriz
1009fc4281 Merge pull request #899 from CHOMPStation2/Metroid1.1 
Fix struggling of metroid removal, sound addition
 2020-11-22 14:47:13 -07:00
Razgriz
1af619dfbd Fix struggling of metroid removal, sound addition 
Added a missing code block to allow people to remove the metroid from their heads or to help others. 

Also added the attach sound.
 2020-11-22 14:17:31 -07:00
Razgriz
61baa91b22 Merge pull request #887 from CHOMPStationBot/upstream-merge-9336 
[MIRROR] Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
 2020-11-22 03:41:36 -07:00
Razgriz
b6e792ed4e Merge pull request #881 from CHOMPStationBot/upstream-merge-9330 
[MIRROR] Eventy stuff and pet protections!
 2020-11-22 03:40:21 -07:00
Nadyr
7fd1eaa5ec Merge pull request #894 from CHOMPStation2/Razgriz1032-patch-3 
Remove Loss Poster
 2020-11-22 04:11:48 -05:00
cadyn
e32cc58cb7 Merge pull request #877 from cadyn/ballistics-v3 
Ballistics v3
 2020-11-22 01:09:17 -08:00
cadyn
425ce61041 Merge pull request #884 from Kazzc/SC-MapUpdate 
Civilian sector overhaul.
 2020-11-22 01:08:56 -08:00
cadyn
254d4b7bf9 Merge pull request #888 from CHOMPStation2/Metroid1.1 
Metroid Event and tweaks
 2020-11-22 01:07:26 -08:00
Razgriz
e56a6c7382 Remove Loss Poster 
Fixes #892
 2020-11-22 01:48:15 -07:00
Razgriz
c88a691f8b Remove stuff for pacify metroid 2020-11-22 01:14:52 -07:00
Razgriz
d2114cba9b Metroid Event and tweaks 
-Baby metroids now have a chance of spawning as part of a new major severity event.

-All slime references within metroid code has been removed.

-Some general stats of metroids have been tweaked.
 2020-11-22 01:00:16 -07:00
Novacat
08900e9e4a Merge pull request #9336 from Tenryumi/blobs-speak-languages-too 
Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
 2020-11-22 04:51:39 +00:00
cadyn
2d06259229 Merge pull request #880 from CHOMPStationBot/upstream-merge-9312 
[MIRROR] Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
 2020-11-21 19:58:29 -08:00
Razgriz
9b44e90793 Merge pull request #878 from CHOMPStation2/Metroid1.0 
Metroid 1.0
 2020-11-21 20:53:32 -07:00
cadyn
a8d22c84a8 fix stupid shit 2020-11-21 19:12:41 -08:00
cadyn
1da78774a8 Even more conflicts. Yum. 2020-11-21 18:52:36 -08:00
cadyn
c23558a35d More conflicts yay 2020-11-21 18:51:16 -08:00
Kassc
9d660c4222 Merge pull request #1 from CHOMPStation2/master 
merge master into branch
 2020-11-21 21:24:20 -05:00
cadyn
9a726c7e5c Merge pull request #886 from CHOMPStation2/dirty_synth_fixerooni 
Fix traits thinking non-synths are synths because their other character was a synth or whatever
 2020-11-21 18:06:18 -08:00
Razgriz
94b6c737aa Merge pull request #866 from CHOMPStationBot/upstream-merge-9310 
[MIRROR] PosterAdds
 2020-11-21 15:18:23 -07:00
cadyn
0ce5d797be Update 07_traits.dm 2020-11-21 14:06:36 -08:00
cadyn
ca04b0ef72 Make the station gateway work :p 2020-11-21 13:24:49 -08:00