cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 8 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

2143 Commits

Author SHA1 Message Date
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
Atermonera
4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Rykka
cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
RadiantFlash7
6cee0d5e54 New lobby screen& Exploration redesign 
Rennovates exploration to remove the super long hallway leading to it and changes our lobby screen to Todd howard style.
x16 times the detail!
 2020-08-21 23:54:06 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
Rykka
9b2e3f8e5d Fixes filepaths to be correct with the new cone types 2020-08-21 08:00:29 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
listerla
c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
izac112
74d84d2cff Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-17 09:44:00 +02:00
ShadowLarkens
f2f2f57777 Canister drop sound 2020-08-16 07:44:20 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00