Commit Graph

11818 Commits

Author SHA1 Message Date
Razgriz
0942ad31ba Merge pull request #579 from MisterGrimm/Xenochanges1.1
Xenomorph Balancing Act 1.1
2020-10-12 23:58:07 -07:00
Razgriz
6ca7b15786 Merge pull request #580 from KasparoVy/i-wear-my-heart-on-my-sleeve
Hearts on BOTH SLEEVES
2020-10-12 23:33:22 -07:00
Razgriz
12e9248c8f Merge pull request #577 from ExabyteDiscord/remove-blatant-memes
Removes loss POI, gnome, pufferfish and ack
2020-10-12 23:32:43 -07:00
Razgriz
712fec09cb Merge pull request #578 from MisterGrimm/PredationChange
Changes Brutal Predation ability name to Hard Vore
2020-10-12 23:32:07 -07:00
Sym
c7480f8d61 Trying to placate Travis 2020-10-11 00:18:38 -04:00
Sym
04882a183d Travis you scoundrel 2020-10-10 23:55:46 -04:00
KasparoVy
a872b0dd8e I Wear my Heart on My Sleeve(s)
Both of them.
2020-10-10 23:17:47 -04:00
Sym
18bc6fb6e3 Xenomorph Balancing Act 1.1
Simple balances and fixes due to a recent event.

- Changed plasma cost for laying eggs, from 75 to 200.

- Changed Agony damage of neurotoxin, from 80 to 60.

- Finally fixed the fact that xenomorphs cannot see in the dark. Xenomorphs can now see turfs and mobs, but lose some range when in the dark.

- Changed ability name Gut to Slaughter, to more accurately describe what it does.
2020-10-10 21:27:48 -04:00
Sym
b7fbd1c584 Changes Brutal Predation ability name to Hard Vore
Seriously, who thought it was a good idea to make the name of the Hard Vore ability to something obscure? This should make it a bit more obvious that you are going to literally eat someone's heart out if you use it.
2020-10-09 12:33:56 -04:00
Erik
442b51117d Removes loss POI, gnome, pufferfish and ack 2020-10-08 17:55:03 -07:00
KasparoVy
12dac5c191 Fixes Only One Accessory Equipped at Spawn & in Character Preview
Ported from Aurora PR#10205, credit to fernerr
EARLYPORT OF POLARIS & VIRGO PRS

Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.

Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
2020-10-08 18:38:37 -04:00
Razgriz
0a8521f900 Merge pull request #568 from cadyn/vspull
Direct pull from virgo
2020-10-06 20:52:54 -07:00
Razgriz
f932863bb2 Merge pull request #570 from MisterGrimm/Moronfixing
Fixing the work of a moron.
2020-10-06 17:16:35 -06:00
Razgriz
d5a4529122 Merge pull request #564 from MisterGrimm/master
Removes Outer Layer and Hat gear for xenomorphs
2020-10-06 15:39:15 -06:00
Razgriz
a3193118c8 Spawn as mouse disclaimer.
Just so that we're clear.
2020-10-06 02:55:59 -07:00
Razgriz
2f0c1a63e1 Merge pull request #552 from cadyn/cadyn-actually-optimizes
Machines.dm Optimization + Bots improvements
2020-10-06 01:13:30 -06:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Sym
025397c417 Fixing the work of a moron.
Just.. Im just frothing with rage while looking at some of this stuff. Some polaris dude named Neerti did a bunch of half assed commenting five years ago, and has been causing a shit ton of warning messages because of it. I ended up fixing most of it out of pure rage.

Tell me if you guys need a CHOMPedit on these, because this is mostly just fixing really stupid commented out stuff that should have been fixed years ago by the person that did this. I wouldn't think it would need a CHOMPedit, but you never know.
2020-10-05 17:55:48 -04:00
Zandario
91c132a6e2 Actually logistics Hivebots were commented as Commander Hivebots too 2020-10-01 21:13:54 -05:00
Zandario
8f86c8742c No idea how much y'all use these but that's kinda a smol OOF 2020-10-01 21:00:47 -05:00
MisterGrimm
8716fea19d Merge pull request #5 from CHOMPStation2/master
Oh god updoot aneurysm
2020-10-01 04:26:53 -04:00
Sym
8104a6dd6b Removes Outer Layer and Hat gear for xenomorphs
Okay, so this has always been a problem. While originally xenomorphs could wear outer clothing and hats, you quickly realised that you was incapable of taking them off without outside help. Normally this was a problematic issue, but wasn't a gamebreaking issue. However, with the new 64x64 sprites this has went from problematic, to gamebreaking. Since the new sprites are 64x64, the hats no longer line up with the new sprites, and you can probably guess how ugly the outer layer clothing looks on them now. Because of this I have decided to finally fix this problem by removing their ability to wear hat and outer layer items.

It was funny while it lasted, but now its time to curb these bugs one at a time.
2020-10-01 04:21:05 -04:00
Novacat
1e396dbf98 Merge pull request #9107 from KillianKirilenko/kk-grubs
Oregrubs
2020-09-28 03:30:44 -04:00
Novacat
f7872acb63 Merge pull request #9130 from Screemonster/treebreathers
Fix alraune suit detection
2020-09-27 20:01:50 -04:00
DESKTOP-4BUBN9N\Mike
9ff12d4e80 Fix alraune suit detection 2020-09-28 00:24:42 +01:00
Razgriz
4ad2efbc81 Update negative.dm 2020-09-26 17:05:37 -07:00
Razgriz
4aaf36d214 Missing close comment 2020-09-26 14:56:11 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Killian
f87c5475c3 Update oregrub.dm 2020-09-25 17:55:04 +01:00
Killian
696e3e1d5e Update oregrub.dm 2020-09-25 16:19:32 +01:00
Killian
be10b6940d Update oregrub.dm 2020-09-25 16:18:45 +01:00
Killian
8c588d5eb6 lootgrubs 2020-09-25 16:02:56 +01:00
Runa Dacino
c64b0425a1 Adds spiderscience to research borg modules 2020-09-24 12:54:49 +02:00
Verkister
959cfbe591 Merge pull request #9074 from KasparoVy/darker_new_tesh_hair
Makes Darker icon_add Versions of ArkStation Tesh Hair
2020-09-24 11:18:00 +03:00
Verkister
958e0f28b3 Merge pull request #9060 from Verkister/bstripes
Adds bee stripes marking by radiantaurora
2020-09-24 11:17:16 +03:00
Razgriz
b74a3b62e4 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into September2020UpstreamPull
Pull from Master
2020-09-22 00:59:03 -07:00
Atermonera
6d652a6a67 Merge pull request #7641 from ShadowLarkens/patch-1
Fix communicator video
2020-09-21 19:09:17 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
1879ed2084 Merge pull request #9070 from VOREStation/upstream-merge-7659
[MIRROR] Fix trying to put people on themselves with the stripping menu
2020-09-21 13:39:49 -04:00
Novacat
3bce6d22e7 Merge pull request #9069 from VOREStation/upstream-merge-7658
[MIRROR] Fix stripping.dm cloning
2020-09-21 13:39:31 -04:00
Novacat
16bf1c1288 Merge pull request #9068 from VOREStation/upstream-merge-7657
[MIRROR] Should fix unset PDA name glitches
2020-09-21 13:39:17 -04:00
Novacat
8ce27f3bbf Merge pull request #9065 from VOREStation/upstream-merge-7650
[MIRROR] Chickens now give chicken meat
2020-09-21 13:37:36 -04:00
Atermonera
8dd7b90329 Merge pull request #7673 from Cyantime/patch-3
Gives mob xenos full darksight
2020-09-21 12:56:18 -04:00
KasparoVy
923b48d6c4 Makes Darker icon_add Versions of ArkStation Tesh Hair
AAttempted to replicate VerySoft's method:

In Paint.Net -> Adjustments -> Brightness/Contrast
Brightness: -68
Contrast: -40

I screwed with the Teshari Mane sprite until I got it to match up with the icon_add version with the above values.
2020-09-20 19:24:19 -04:00
Meghan-Rossi
2ebfd20cb0 Fix trying to put people on themselves with the stripping menu (#7659)
*If you try to put someone in one of their own slots using the stripping menu, now you will instead try to strip that slot.

This always seems to be what people trying this actually mean to do, I've made this mistake and seen a few others make it too.  This also fixes buggy behavior downstream where people can actually succeed in putting people on themselves.
2020-09-20 07:16:19 -04:00
cadyn
4e8051f8e6 Fix stripping.dm cloning (#7658) 2020-09-20 07:14:01 -04:00
Atermonera
0bdc2de31c Should fix unset PDA name glitches (#7657) 2020-09-20 06:59:25 -04:00
Cyantime
fd43581746 Chickens now give chicken meat (#7650) 2020-09-20 06:52:29 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
Verkister
728fea84d8 Adds bee stripes marking by radiantaurora 2020-09-20 12:22:06 +03:00