cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,956 Commits 8 Branches 0 Tags
6ebd2497489eb8aef5d0da7c1650d4a26e800371
Commit Graph

573 Commits

Author SHA1 Message Date
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -04:00
KasparoVy
eed070851e Enabled the Smelting of Plastitanium 
Seems like an oversight - can make titanium (smelting rutile), titanium glass & plastitanium glass but not plastitanium.
 2020-04-21 21:42:35 -04:00
Aronai Sieyes
ace05634f5 Merge pull request #7354 from VOREStation/aro-tweaks 
Smol Fixes
 2020-04-20 19:39:47 -04:00
Aronai Sieyes
e9f7a40600 Add points for rutile ore 2020-04-20 13:56:06 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Unknown
a5f62634be Adds additional safeties 
Stops ships from being deployable on planet surfaces
 2020-04-19 19:30:35 -04:00
Unknown
c322941953 Assault Dropship, NDV Daedalus, and more! 
- Adds an adminbus archeotech military dropship
- Renames the cruiser to the NDV Daedalus
- Removes the Daedalus' Vault, replaces with a engine room consisting of four nuclear reactors. 800 kw safe output
- Replaces the hull material of the Daedalus with something destructable
- Thickens the frontal hull of the Daedalus
- Combines shelter_atoms.dm and shelter_atoms_vr.dm into shelter_atoms_vr.dm (Polaris never ported Shelter capsules from us)
- Moves shelters.dm to shelters_vr.dm
- Fixes scanner readout of the Escape Pod
 2020-04-19 15:01:40 -04:00
Unknown
5d2186cafd Fixfix Travis 2020-04-17 09:27:31 -04:00
Unknown
d1e2412d76 Deployable Escape Pods 
- Adds Surfluid Escape Pod Capsule
Adds one to the cruiser
Updates some contents
Adds Support for unique deployables
Removes redundant global vars
Better error message
Sets a var correctly
 2020-04-17 09:17:46 -04:00
KasparoVy
b4d290b7c2 Increases the Potential of Ore Eater & Adds Adminbus 
It can now be effectively granted to non-humans, who can now eat ore if they click it while NOT on help intent.
Additionally, you can now feed ore to mobs that can eat it.
 2020-04-06 22:18:00 -04:00
KasparoVy
04378e159e Abstract Eating of Ore to Fix Unintentional Prompt 
Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.

This resolves the issue, instead just showing the "nothing in your hand" message as intended.
 2020-04-03 23:14:42 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
KasparoVv
af2b83379a Add VS Edit 
Arokha's recommendation

Co-Authored-By: Aronai Sieyes <arokha@arokha.com>
 2020-04-02 03:31:43 +00:00
KasparoVy
bb756cbdc9 Adds a Rocky Diet 
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.

5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
 2020-04-01 21:52:27 -04:00
Aronai Sieyes
bf2b02aa34 VS: Tweak because of mining vendor sprite 2020-03-31 13:56:38 -04:00
Aronai Sieyes
9b07ee0a29 Mining equipment vendor use new vendor sprite 2020-03-31 13:56:38 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
 2020-03-31 13:56:38 -04:00
InterroLouis
f87e63f95a Delete ore_datum_vr.dm 2020-03-29 13:48:09 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
f28dcdb2d4 Merge pull request #6855 from Schnayy/newterrain 
POI wall nonsense
 2020-03-18 04:10:18 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Schnayy
0185f541e3 Merge pull request #6821 from PrismaticGynoid/xenoarch_fix 
Xenoarch fix
 2020-03-13 10:47:13 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
Aronai Sieyes
f71bfa7100 Ore Scanner is written incorrectly 
Only revealed by vchat
 2020-03-01 17:22:31 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Novacat
33570d10e6 Update ore_box.dm 2020-02-17 01:33:15 -05:00
Novacat
332e3271d9 Update ore_box.dm 2020-02-17 01:31:48 -05:00
Atermonera
c5b6dfa259 Fixes mining borg ore box movement astral sorcery 2020-02-17 01:18:31 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Heroman
69ab62b510 pre-defines vacuum mineral turfs to appease travis 2020-01-23 19:07:19 +10:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Heroman3003
dfb6ce947b Fixes shelter lighting when deployed in lighting-unsimulated area 2019-09-26 10:15:19 +10:00
Unknown
69691a209f No need for wall checks 2019-09-18 15:35:56 -04:00
Unknown
fcaf8906b2 Shelter Capsule Deploy Check 
...Simpler and hopefully it works
 2019-09-18 15:30:59 -04:00
Unknown
45d493c0b0 Adds bar shelter capsule to vendors 2019-09-15 21:03:58 -04:00
Novacat
305e79db40 Merge pull request #5834 from Novacat/nova-heterochromia 
Cargo hardsuit changes
 2019-09-14 00:39:23 -04:00
Unknown
1ae104f4bd Fixes logic problems 2019-09-13 00:11:47 -04:00
Unknown
4f9fb90e90 Fixes check 2019-09-12 23:29:25 -04:00
Unknown
7fcd2e3f3f Removes redundant code, fixes whitelists/blacklists 2019-09-12 23:23:22 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Unknown
db45400201 Same fix, much better code 2019-09-12 01:13:10 -04:00
Unknown
c0f75d7e7b Miscellaneous Fixes Pt. 2 
- Shelter Capsules deployed indoors will no longer destroy above turfs.
 2019-09-12 00:32:56 -04:00