cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 9 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

11944 Commits

Author SHA1 Message Date
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
Verkister
e700936b20 Merge pull request #9042 from AmayaWah/testyourstuffamayapls 
fixes typos + removes . from mechanical/viscerator
 2020-09-20 12:10:31 +03:00
Braiden
c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
Novacat
d9b2ed1fce Merge pull request #9050 from VOREStation/upstream-merge-7656 
[MIRROR] Graffiti + Filth Fixes
 2020-09-19 00:37:11 -04:00
Novacat
b5615f1c40 Merge pull request #9048 from VOREStation/upstream-merge-7666 
[MIRROR] AI eye no longer appears on turf tab
 2020-09-19 00:36:42 -04:00
Cerebulon
6e8a506233 Graffiti + Filth Fixes (#7656) 2020-09-18 23:47:38 -04:00
Atermonera
7a157f3f14 AI eye no longer appears on turf tab (#7666) 2020-09-18 23:35:53 -04:00
Atermonera
367a8501ac /atom/visible_message respects exclude_mobs (#7665) 2020-09-18 23:34:38 -04:00
Amaya
c12ad11cf5 typos 
also fixes . in code
 2020-09-19 00:22:45 +02:00
Cadyn
c64c9d1fd0 Machines and bots improvement 
>:3
 2020-09-18 00:07:40 -07:00
ShadowLarkens
90bec919e9 TGUI Silicon Crew Manifest & PDA Access 2020-09-17 23:43:31 -07:00
ShadowLarkens
ff932614eb TGUI pAIs & Infomoprh (Sleeve-card) 2020-09-17 23:10:33 -07:00
ShadowLarkens
e9566c606d TGUI pAI Radio 2020-09-17 20:09:34 -07:00
ShadowLarkens
953c76078d TGUI pAI Crew Manifest (and abstract it away from every other template stealing from the ID computer) 2020-09-17 20:01:38 -07:00
Novacat
a7481a394a Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase 
TGUI PDAs/Uplink
 2020-09-17 09:37:50 -04:00
ShadowLarkens
637576848e TGUI PDAs Finale (minus newscaster) 2020-09-16 21:31:50 -07:00
Meghan-Rossi
daa017c7d1 Makes morph impersonation respect body impersonation preference 2020-09-17 05:28:32 +01:00
Cadyn
f3a6ee715a upstream consistent 2020-09-16 01:21:26 -07:00
Nadyr
d36bee1964 Merge pull request #549 from BlackMajor/Screm 
Teshari's have a sound on *scream now.
 2020-09-16 01:35:08 -04:00
BlackMajor
0ff8e72642 Update emote.dm 2020-09-16 17:17:21 +12:00
BlackMajor
3e0ffd8f9d funny chompstation add 2020-09-16 17:04:15 +12:00
BlackMajor
ef77cb88b1 Probably should've removed the comment first 2020-09-16 14:35:16 +12:00
Cadyn
b6d62ca18e Fix stripping.dm cloning issues 2020-09-15 19:34:25 -07:00
BlackMajor
70645b91dd he screm 2020-09-16 14:26:44 +12:00