cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 23:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,028 Commits 6 Branches 0 Tags
32da9967a369ecd1a20b30e98e452e37a8945d0a
Commit Graph

2174 Commits

Author SHA1 Message Date
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
4729aba17f Merge pull request #1340 from CHOMPStationBot/upstream-merge-9727 
[MIRROR] [MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-18 04:28:54 -07:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Novacat
ad8b82ce05 Merge pull request #9727 from VOREStation/upstream-merge-7844 
[MIRROR] Makes wrenches only anchor lockers if they're open
 2021-02-16 01:33:19 +00:00
Nadyr
83861014e7 Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691 
[MIRROR] [MIRROR] Allows custom-selection of posters
 2021-02-14 07:09:52 -05:00
Razgriz
ebe5c88699 Merge pull request #1273 from CHOMPStationBot/upstream-merge-9543 
[MIRROR] [MIRROR] Space cleaner cleans mobs
 2021-02-13 15:52:23 -07:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Razgriz
d600952be7 Merge pull request #1167 from CHOMPStationBot/upstream-merge-9517 
[MIRROR] [MIRROR] Directional Signs Update
 2021-02-11 22:23:56 -07:00
Verkister
3e2d6f6f76 Merge pull request #9543 from VOREStation/upstream-merge-7802 
[MIRROR] Space cleaner cleans mobs
 2021-02-09 18:18:03 +00:00
cadyn
373329e941 Merge pull request #1220 from CHOMPStationBot/upstream-merge-9623 
[MIRROR] Adds flushable toilets.
 2021-02-04 23:48:40 -08:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Verkister
9269ff74a0 Merge pull request #9623 from Verkister/thronetime 
Adds flushable toilets.
 2021-02-01 09:45:34 +00:00
Razgriz
710c6b5021 Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615 
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
 2021-01-30 00:20:38 -07:00
Shadow Quill
636278b1ac Adds EFTPOS scanners to security/warden lockers, and a few items as well 2021-01-28 20:22:21 -06:00
Chompstation Bot
be8d010ff9 Converts Morph Spawn and Maint Pred events to use ghostpods 2021-01-27 02:25:00 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
76258d4316 Merge pull request #9517 from VOREStation/upstream-merge-7792 
[MIRROR] Directional Signs Update
 2021-01-24 06:46:41 +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