cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,487 Commits 8 Branches 0 Tags
ee2a4bbc77790650d536cf3c98001ca42c034aa6
Commit Graph

9531 Commits

Author SHA1 Message Date
Nadyr
b23802f59a powder that makes you say yes 2021-06-21 20:14:04 -04:00
Nadyr
001d40aab1 powder that makes you say yes 2021-06-21 20:12:38 -04:00
Nadyr
9c54bc8858 powder that makes you say yes 2021-06-21 20:07:22 -04:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Nadyr
587e1f529f powder that makes you say yes 2021-06-20 20:54:13 -04:00
Razgriz
b287747d4e Merge branch 'master' into upstream-merge-10683 2021-06-20 17:17:44 -07:00
Razgriz
096246abff Merge pull request #2247 from cadyn/upstream-merge-10476 
Manual Mirror Vorestation #10476
 2021-06-20 17:14:14 -07:00
Razgriz
0eab5eb020 powder that makes you say yes 2021-06-20 16:57:35 -07:00
Razgriz
582053257d Update denecrotizer_vr.dm 2021-06-20 16:13:27 -07:00
Novacat
f2d035cec0 Merge pull request #10711 from Hatterhat/wasted-waste 
timers and whatnot are printable now, actually
 2021-06-20 14:11:19 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Nadyr
8f9786e8c2 Merge branch 'master' into upstream-merge-10704 2021-06-19 22:01:09 -04:00
Nadyr
a9d5ef0fbc Merge pull request #2241 from CHOMPStationBot/upstream-merge-10694 
[MIRROR] [MIRROR] Refactors utensils to use weakrefs
 2021-06-19 21:59:34 -04:00
Nadyr
f0c2544f17 Merge pull request #2231 from CHOMPStationBot/upstream-merge-10652 
[MIRROR] Porting Over De-Husking Surgery
 2021-06-19 21:58:37 -04:00
Nadyr
1d2b8edac6 Merge pull request #2239 from CHOMPStationBot/upstream-merge-10703 
[MIRROR] Fixes observers being able to open vore eggs
 2021-06-19 21:52:11 -04:00
Nadyr
f49e08b8eb Merge pull request #2237 from CHOMPStationBot/upstream-merge-10696 
[MIRROR] Tweaks the denecrotizer
 2021-06-19 21:51:34 -04:00
Nadyr
2108ac7c65 powder that makes you say yes 2021-06-19 21:43:57 -04:00
Nadyr
06337b17d6 Merge pull request #2222 from CHOMPStationBot/upstream-merge-10641 
[MIRROR] [MIRROR] Adds a graffiti spawner for PoI and general map-making.
 2021-06-19 21:39:18 -04:00
Nadyr
374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660 
[MIRROR] ITV Merchandise (Talon Gear)
 2021-06-19 21:25:44 -04:00
Chompstation Bot
3b9ba4e1fc Really fixes eggs being operable by ghosts 2021-06-19 15:23:53 +00:00
Novacat
571025d718 Merge pull request #10694 from VOREStation/upstream-merge-8140 
[MIRROR] Refactors utensils to use weakrefs
 2021-06-19 13:44:00 +00:00
Novacat
9c1ce64978 Merge pull request #10703 from Verkister/patch-58 
Fixes observers being able to open vore eggs
 2021-06-19 13:31:34 +00:00
Chompstation Bot
3b5ab4d9a6 Tweaks the denecrotizer 2021-06-19 03:39:53 +00:00
Razgriz
ffd82c6d5e Merge branch 'master' into upstream-merge-10683 2021-06-18 19:31:31 -07:00
Razgriz
fe6a182d07 Merge pull request #2228 from CHOMPStationBot/upstream-merge-10684 
[MIRROR] Fixes Field Medic Lockers
 2021-06-18 19:11:42 -07:00
Chompstation Bot
4b89d37b6d Porting Over De-Husking Surgery 2021-06-18 21:07:55 +00:00
Novacat
d8bc9dec51 Merge pull request #10684 from Novacat/nova-basicfixes 
Fixes Field Medic Lockers
 2021-06-18 18:02:30 +00:00
Chompstation Bot
b69e24086a 6 fixes 2021-06-18 18:02:23 +00:00
Chompstation Bot
68b6d08b6d [MIRROR] Adds a graffiti spawner for PoI and general map-making. 2021-06-18 04:44:47 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Razgriz
443447ba5f Bring back random mine mobs (#2205) 
* chomp mod spawner

* mob spawner

* mine mob spawner

* Update vorestation.dme

* Update caves.dm
 2021-06-16 01:52:09 -07:00
Novacat
8d0a7af731 Merge pull request #10656 from ShadowLarkens/multitool_and_attackby_fix 
Make item/attackby call ..(), multitool tool quality fix
 2021-06-15 22:59:41 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Nadyr
0b59257d93 Merge pull request #2173 from CHOMPStationBot/upstream-merge-10611 
[MIRROR] [MIRROR] stops armour plate and armour plate inserts having the same name, and…
 2021-06-11 15:43:18 -04:00
Nadyr
1e889a1928 Merge pull request #2171 from CHOMPStationBot/upstream-merge-10615 
[MIRROR] Explo/SAR Locker Tweak
 2021-06-11 15:23:04 -04:00
Nadyr
b72fbd7861 Merge pull request #2157 from Verkister/maintpreddies 
Adds more mobs to maint pred options.
 2021-06-11 15:22:10 -04:00
Aronai Sieyes
4edcaa7908 Merge pull request #10611 from VOREStation/upstream-merge-8123 
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
 2021-06-11 19:22:01 +00:00
Aronai Sieyes
2748b83176 Merge pull request #10615 from KillianKirilenko/kk-fixes 
Explo/SAR Locker Tweak
 2021-06-11 19:12:38 +00:00
Nadyr
d43aef3cea Merge pull request #2129 from BlackMajor/bigdragon 
New mob: Large Dragon, and some changes.
 2021-06-09 18:35:02 -04:00
Nadyr
2c4d2d21f4 Merge pull request #2162 from CHOMPStationBot/upstream-merge-10598 
[MIRROR] Exploration Duffle Fix
 2021-06-09 18:17:17 -04:00
BlackMajor
95451ea9c5 Update event_vr.dm 2021-06-10 09:23:35 +12:00
Nadyr
fea05d66d4 Merge pull request #2159 from CHOMPStationBot/upstream-merge-10600 
[MIRROR] Fixes belly sensor jamming
 2021-06-09 17:05:07 -04:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix 
Exploration Duffle Fix
 2021-06-09 14:42:19 +00:00
Novacat
367bbcb329 Merge pull request #10600 from Verkister/patch-56 
Fixes belly sensor jamming
 2021-06-09 14:22:37 +00:00
Verkister
2b879c2a05 Adds more mobs to maint pred options. 
-Added fox, syndi-fox, raccoon, cat, lizardman, direwolf, diredog, hyena, chubby oties (base/mutated/red), and zorgoia.
 2021-06-09 12:08:31 +03:00
Aronai Sieyes
666786d4b7 Merge pull request #10594 from VOREStation/Arokha/paradoors 
Ports Paradise pod doors
 2021-06-09 00:45:09 +00:00
Nadyr
4db0aee294 Merge pull request #2150 from CHOMPStationBot/upstream-merge-10584 
[MIRROR] Explorer storage items
 2021-06-08 01:39:37 -04:00
Nadyr
96403c6621 Merge pull request #2147 from CHOMPStationBot/upstream-merge-10570 
[MIRROR] [MIRROR] Adds new UI for secure stuff
 2021-06-07 19:39:27 -04:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00