cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-30 20:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,410 Commits 5 Branches 0 Tags
78e9cb2123b8fb1bcd492560fbdcb77e00a82cc0
Commit Graph

2158 Commits

Author SHA1 Message Date
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
cadyn
58e59eaa6b Merge pull request #1149 from Sharkmare/master 
Adds Sharkpile prototype + 939
 2021-01-22 11:11:38 -08:00
Sharkmare
3e703733cb putting th eunique check in the correct spot woops 2021-01-21 08:28:03 +01:00
Sharkmare
8f95cb6125 Adding the one of a kind feature gamma has 
However, this is contained tot his one pile, not across all piles
Also optional
 2021-01-21 08:24:34 +01:00
Sharkmare
5857cfdbdd Adds Sharpile prototype 
This adds a variant of trashpiles i spaghettied up.

These piles have the ability to override the default spawn tables (changeable in mapping) and also can be given a % chance to just yeet themselves out of existance. Each % value can be adjusted in mapping othing is hardcoded. This also makes making unique sub types of trashpules simpler

Not his pile does not spawn sharks (yet)
 2021-01-21 08:01:59 +01:00
Razgriz
e67b668f6e Update detective wardrobe 
-Replaces black gloves with forensics gloves.
-Restores the gunbox
 2021-01-19 15:11:55 -07:00
Holdelta
827dc6ca29 Update trash_pile_vr.dm 2021-01-17 02:25:06 -08:00
Chompstation Bot
c8e698aac2 Wreck & Debris Field Updates 2020-12-22 15:32:40 +00:00
Novacat
f852e53f88 Merge pull request #9456 from Very-Soft/longer-bonfires 
Makes bonfires last longer!
 2020-12-14 03:17:47 +00:00
Chompstation Bot
ae92942bde Abductor Ship 2020-12-08 18:56:09 +00:00
Nadyr
0cb47f9a19 Merge pull request #980 from CHOMPStationBot/upstream-merge-9422 
[MIRROR] [MIRROR] Plainleather & Tobacco
 2020-12-08 03:14:03 -05:00
Nadyr
d452144e20 Merge pull request #965 from CHOMPStationBot/upstream-merge-9393 
[MIRROR] [MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
 2020-12-08 02:59:52 -05:00
Novacat
cd1ad32cb2 Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-08 03:38:26 +00:00
Novacat
56a9dbf677 Merge pull request #9393 from VOREStation/upstream-merge-7749 
[MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
 2020-12-05 01:57:11 +00:00
Novacat
ef7a8f2cda Merge pull request #9402 from Very-Soft/dauntless 
ITG Dauntless
 2020-12-03 23:35:54 +00:00
cadyn
93ad7eab9a Merge pull request #838 from CHOMPStationBot/upstream-merge-8848 
[MIRROR] Remove gravity from debris field and rogue mining zones
 2020-11-15 00:57:51 -08:00
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Cadyn
9efa4251ca Spicy Engineering :o 2020-11-13 04:35:15 -08:00
Razgriz
65bea48122 Merge pull request #820 from CHOMPStationBot/upstream-merge-9288 
[MIRROR] [MIRROR] Adds the Frostbelle
 2020-11-11 19:16:05 -07:00
Chompstation Bot
e127655b5d [MIRROR] Adds the Frostbelle 2020-11-08 17:05:55 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Nadyr
c24e9101c8 Merge pull request #733 from CHOMPStationBot/upstream-merge-9217 
[MIRROR] Creates proper names and descriptions for sprites found in amayastuff.dmi.
 2020-10-22 10:16:33 -04:00
Verkister
2bb6e0504e Merge pull request #9217 from AmayaWah/flora-again 
Creates proper names and descriptions for sprites found in amayastuff.dmi.
 2020-10-19 10:41:00 +00:00
Verkister
d7298336a8 Merge pull request #9242 from VOREStation/upstream-merge-7724 
[MIRROR] Wall Cabinets & Crate Markings
 2020-10-19 10:37:04 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Amaya
6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Novacat
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -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
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
Cyantime
2acf8dcbed Fix floor safe plane (#7648) 2020-09-20 06:52:42 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
bdb0dcc152 TGUI Janicart 2020-09-19 16:32:53 -07:00
Atermonera
acb5b03041 Fixes janitor cart examine (#7655) 2020-09-18 23:41:15 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks 
also adds plastitanium hull components for later use
 2020-09-08 06:34:44 +01:00
Killian
bdaadc5726 general polish and prep 
includes some groundwork for the second phase of this PR
 2020-09-08 01:17:45 +01:00
Killian
5b4dc6069a all tests complete 2020-09-07 07:56:41 +01:00
Atermonera
87221b5e66 Adds hailer gas (face) masks. 2020-08-31 18:10:57 -04:00
cadyn
9101e37e6f Big woopsie-dasies fixed 2020-08-28 13:06:58 -07:00
cadyn
860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Unknown
abef279ba7 compatibility fixes 2020-08-28 12:49:11 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00