cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 09:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,998 Commits 7 Branches 0 Tags
92ff2bcbf42f0a30f38bc002e8020fb1bce762a5
Commit Graph

25895 Commits

Author SHA1 Message Date
ShadowLarkens
92ff2bcbf4 Recompile nanomaps, and add nanomap improvements 2020-09-25 03:52:49 -07:00
ShadowLarkens
cf9b39b4a9 Set up GitHub action for nanomap generation 2020-09-25 03:25:07 -07: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
Novacat
44a1a3428c Merge pull request #9094 from VOREStation/upstream-merge-7676 
[MIRROR] Fixes runtime in add_reagent()
 2020-09-24 02:10:07 -04:00
Atermonera
3204c9f9a5 Fixes runtime in add_reagent() (#7676) 
Bad index: data["species"] when data is not a list
 2020-09-22 23:40:38 -04:00
Atermonera
9c74c998c7 Fixes runtime in prison_break.dm (#7677) 
Bad arg name: open_blast_doors
 2020-09-22 23:40:26 -04:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475 
[MIRROR] Hydro upkeep
 2020-09-21 19:42:43 -04:00
Atermonera
6d652a6a67 Merge pull request #7641 from ShadowLarkens/patch-1 
Fix communicator video
 2020-09-21 19:09:17 -04:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660 
[MIRROR] Fix duplicate results from analyzing some objects
 2020-09-21 16:54:29 -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
0ed68c9d54 Merge pull request #9078 from VOREStation/upstream-merge-7669 
[MIRROR] Fix Beaker Dipping
 2020-09-21 14:06:28 -04:00
Novacat
fd563559ad Merge pull request #9077 from VOREStation/upstream-merge-7668 
[MIRROR] Actually commit the reagent cycler's entire gimmick.
 2020-09-21 14:06:14 -04:00
Novacat
e72d810c31 Update _appliance.dm 2020-09-21 13:54:40 -04:00
Novacat
23d0b9a699 Update _appliance.dm 2020-09-21 13:54:02 -04:00
Novacat
6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651 
[MIRROR] Tweaks to pickup/equip sounds.
 2020-09-21 13:51:44 -04:00
Novacat
9eff136dc9 Merge pull request #9063 from VOREStation/upstream-merge-7642 
[MIRROR] Adds two new augments to Traitor uplink
 2020-09-21 13:50:29 -04:00
Novacat
c41b172afb Merge pull request #9064 from VOREStation/upstream-merge-7645 
[MIRROR] Improve gun animations to be more modular.
 2020-09-21 13:50:05 -04:00
Novacat
32fa026aa5 Merge pull request #9079 from VOREStation/upstream-merge-7672 
[MIRROR] Fix fat tasting bitter
 2020-09-21 13:43:02 -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
Atermonera
797873c769 Merge pull request #7672 from Meghan-Rossi/triglyceride_taste 
Fix fat tasting bitter
 2020-09-21 12:55:01 -04:00
Atermonera
84b9867fd0 Merge pull request #7669 from Mechoid/FixBeakerdipping 
Fix Beaker Dipping
 2020-09-21 12:49:38 -04:00
Atermonera
d0fd1df327 Merge pull request #7668 from Mechoid/ReagentCyclingCycler 
Actually commit the reagent cycler's entire gimmick.
 2020-09-21 12:48:24 -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
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -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
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
Cyantime
fd43581746 Chickens now give chicken meat (#7650) 2020-09-20 06:52:29 -04:00
Kates
19aa0200db Improve gun animations to be more modular. (#7645) 
* Improve gun animations to be more modular.
- This is a port of TGCM pull/4807. Credit to SplinterGP for helping me set things up.
- It essentially allows people to not need a '-pump' for their animation, but instead to just use whatever they please. They just need to write it down at the relevant intervals.

* Improve further.

* Update shotgun.dm
 2020-09-20 06:51:14 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
d9d3bc61f3 Quickfix for fax machines not working 2020-09-20 02:45:04 -07: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
ShadowLarkens
e18fb0fd7e Wait, this wasn't accessible anyways. 2020-09-20 01:18:10 -07:00
ShadowLarkens
0f7d2b6e00 TGUI Turbine 2020-09-20 01:11:45 -07:00
ShadowLarkens
66b28a69ab TGUI Battery Rack 2020-09-20 00:50:02 -07:00
ShadowLarkens
375e178046 TGUI Photocopier & Guest Pass 2020-09-20 00:07:09 -07:00
ShadowLarkens
308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
ShadowLarkens
ca60db08aa TGUI Fax Machine 2020-09-19 22:36:34 -07:00
ShadowLarkens
34b5ffd1ac TGUI Accounts Terminal 2020-09-19 22:09:06 -07:00
ShadowLarkens
b1c7c65cb6 TGUI Teleporter 2020-09-19 21:16:18 -07:00
ShadowLarkens
c3a8ea0b54 TGUI Telesci 2020-09-19 20:20:26 -07:00