cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 10:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,592 Commits 8 Branches 0 Tags
e1ec137e2ad8f4f70f160fa8a2decdca954fe934
Commit Graph

5513 Commits

Author SHA1 Message Date
Razgriz
6bb324fd55 fix comment compile error 2020-07-13 03:08:46 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Izac Joof Forsgren
cf891ce999 Update code/game/objects/items/stacks/tiles/tile_types.dm 2020-07-04 08:26:15 +02:00
Luke Vale
8221cbc4ad Adds in the files because I'm a dummy 2020-07-04 01:25:23 -05:00
Luke Vale
2098a55ae7 Adds in the other carpet types as a buyable crate. 2020-07-04 01:18:26 -05:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Atermonera
90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02: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
Repede
fd9de48a1b morefix 2020-06-13 15:13:57 -04:00
Repede
e6a66cfb08 weh 2020-06-13 15:08:10 -04:00
Repede
ee9c1dbad7 adds missing comments 2020-06-13 15:06:49 -04:00
Repede
8ff5309d29 Fixes RPDs so they all work spawned or not, activated or not, etc. 2020-06-13 14:46:44 -04:00
izac112
e39b511a5a removes obosolote 2020-06-13 19:07:49 +02: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
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
CHOMPStation2
b6e1e20deb Update starcaster_ch.dm 
Added a blank line just to diffbots
 2020-06-08 12:14:12 -07:00
Darlantan
5e776cdc0b Adds Starcaster 
-Adds the starcaster, a device for reading the news.
-Adds starcaster as a free loadout item
-Comments out sleepy sergal articles, adds starfire articles
 2020-06-08 07:28:15 -04: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
izac112
4e87398278 Fixes large body bag 2020-06-07 17:46:45 +02: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
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02: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
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02: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
Aronai Sieyes
ea8c29acc8 VS: Dogborg clotter 2020-05-27 16:44:37 -04:00
Aronai Sieyes
d58087c18c Fix medical stack exploit 2020-05-27 16:44:19 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Cyantime
9b6c2c07a4 Show sent PDA messages to sender 2020-05-25 20:05:25 -04:00
Aronai Sieyes
c731db728e Merge pull request #8036 from VOREStation/Arokha/issue8035 
Add safety to GPSes to avoid runtimes
 2020-05-22 16:29:15 -04:00
Aronai Sieyes
b9bdd25a3a Add safety to GPSes to avoid runtimes 2020-05-22 11:29:11 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets 
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
 2020-05-22 03:55:04 -04:00
Aronai Sieyes
6483a18b6a Merge pull request #8007 from VOREStation/upstream-merge-7172 
[MIRROR] Hybrid tools buffs.
 2020-05-21 16:05:32 -04:00
Aronai Sieyes
af2a4cb216 Merge pull request #7998 from VOREStation/Arokha/issue7927 
Tweak beartraps, alerts
 2020-05-21 15:39:47 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Atermonera
b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools 
Hybrid tools buffs.
 2020-05-21 14:32:45 -04:00
Aronai Sieyes
bf3bdbf0e1 Traps don't get weird with removed limbs 2020-05-21 12:38:10 -04:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
8e9b61f7e1 Updates encryptionkey_vr.dm to be in line with our chain of command. 2020-05-20 14:43:30 +02:00
Aronai Sieyes
fc849d9e36 Merge pull request #7962 from VOREStation/Arokha/playsound 
Alter playsound paradigm
 2020-05-19 11:20:52 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00