cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 10:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,959 Commits 12 Branches 0 Tags
5dcbaf77cd5908d85eff52cf2b007bfee69b9c2f
Commit Graph

5312 Commits

Author SHA1 Message Date
Novacat
5dcbaf77cd Merge pull request #8605 from Novacat/nova-shuttle 
Translocator and Micromech Tweaks
 2020-08-06 15:45:16 -04:00
Atermonera
8ca03da239 Merge pull request #7403 from dwinters99/mechtoy-and-arcade 
Mechtoy and arcade
 2020-08-06 14:45:03 -04:00
Novacat
369e3448ed Merge pull request #8602 from VOREStation/upstream-merge-7361 
[MIRROR] Overdose changes + General chem mods
 2020-08-06 02:59:32 -04:00
Unknown
ac0831882f Translocator and Micromech Tweaks 
- Translocators now have a delay similar to hypospray for targets not on help intent. Targets with AI will also have the delay
- Micromechs no longer have thicc armor
 2020-08-05 22:57:10 -04:00
Atermonera
012a4a290c Overdose changes + General chem mods 2020-08-05 20:53:32 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags. 
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
 2020-08-02 22:22:27 +02:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Cyantime
c70900f3f1 Fixes ambiguity of pizza portal location 2020-07-31 23:11:38 -04:00
Novacat
c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377 
[MIRROR] Species Vars Extension Pt3: Blood!
 2020-07-31 17:19:01 -04:00
Heroman
00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires 
# Conflicts:
#	code/__defines/misc.dm
 2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff 
Adds dragon-y language and "*gao" emote
 2020-07-21 18:12:43 -04:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
ShadowLarkens
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added 
Now onto the bugfixing nightmares!
 2020-07-16 00:37:22 -04:00
Rykka
9c66b2f269 Fix Janicart PDA bug from Aro's Rewrite of Janicarts. 
Fixes https://github.com/VOREStation/VOREStation/issues/8387 that happened as a result of the janicart rewrite, and them no longer starting with buckets.

Polaris PR incoming ASAP.
 2020-07-13 20:50:26 -04:00
Unknown
0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -04:00
Novacat
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls 
BALL!
 2020-07-09 20:08:21 -04:00
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites 
New book sprites + inhands
 2020-07-09 17:33:58 -04:00
Killian
721b456eea renamed them balls 2020-07-08 22:30:12 +01:00
Killian
0081e02688 Update balls.dm 2020-07-07 20:33:15 +01:00
Killian
68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00
Novacat
2ae8cb3b9d Merge pull request #8331 from lbnesquik/Kot-Explorer-Shield 
Make the explorer shield light slightly brighter
 2020-06-28 12:52:11 -04:00
Novacat
c12b655f68 Merge pull request #8339 from VOREStation/upstream-merge-7304 
[MIRROR] Offload Defibrillatability from NO_SCAN
 2020-06-28 12:50:32 -04:00
Atermonera
5fbc4f3189 Merge pull request #7304 from KillianKirilenko/kk-bio 
Offload Defibrillatability from NO_SCAN
 2020-06-25 15:44:49 -04:00
Atermonera
c5bca5d257 Merge pull request #7303 from BillyBangles/deep-blue-can-suck-my-toe 
Adds chess pieces and chessboard holodeck program
 2020-06-25 15:43:34 -04:00
lbnesquik
b0435a32d5 Make the shield slightly brighter to reflect the gigantic bar on the front. 2020-06-24 06:05:52 +02:00
Atermonera
90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
Aronai Sieyes
e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield 
Introduce a SINGLE themed, colored explorer shield.
 2020-06-15 11:33:14 -04:00
Atermonera
bcd18e4997 Merge pull request #7278 from VOREStation/vplk-unused-image-assets 
Remove Unused Image Assets
 2020-06-14 21:32:34 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
Unknown
0412103fc2 Vox Phoron and Adminbus Backpacks 
- Fixes broken object sprites for adminbus backpacks
- Increases default air contents of Vox Phoron tank to 10 atmos (up from 6 atmos)
 2020-06-14 12:15:58 -04:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield 
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
 2020-06-11 04:14:54 +02:00
Aronai Sieyes
e27f831bc5 Merge pull request #8219 from VOREStation/upstream-merge-7264 
[MIRROR] Adds marble floor tiles and crafting recipe
 2020-06-07 14:36:35 -04:00
Aronai Sieyes
002b0ce5db Merge pull request #7801 from Holdelta/hol-rms 
New Engineering Tool - RMS: Rapid Material Synthesizer
 2020-06-07 14:01:57 -04:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00
Atermonera
09d5356ba2 Merge pull request #7262 from lolman360/master 
fixes hybrid crowbars
 2020-06-04 22:26:59 -04:00
Aronai Sieyes
9789b1d565 Add emergency suit cooler unit with fixed lowpower cell 2020-05-31 16:58:39 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
954412a26a Merge pull request #8092 from VOREStation/Arokha/bloodspray 
Give medihounds a new toy
 2020-05-28 16:59:12 -04:00
Arokha Sieyes
83a9765691 Add sleevemate feature 2020-05-27 21:55:35 -04:00