cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-19 22:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,362 Commits 8 Branches 0 Tags
f49e08b8ebdc458a646cbb98201224a4bb98fd86
Commit Graph

9509 Commits

Author SHA1 Message Date
Nadyr
f49e08b8eb Merge pull request #2237 from CHOMPStationBot/upstream-merge-10696 
[MIRROR] Tweaks the denecrotizer
 2021-06-19 21:51:34 -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
3b5ab4d9a6 Tweaks the denecrotizer 2021-06-19 03:39:53 +00: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
Novacat
d8bc9dec51 Merge pull request #10684 from Novacat/nova-basicfixes 
Fixes Field Medic Lockers
 2021-06-18 18:02:30 +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
Nadyr
0148ab6b17 Merge pull request #2148 from CHOMPStationBot/upstream-merge-10568 
[MIRROR] [MIRROR] Add Secret ZLevels
 2021-06-07 19:28:20 -04:00
Nadyr
53949ecbf7 Merge pull request #2145 from CHOMPStationBot/upstream-merge-10569 
[MIRROR] [MIRROR] Random mob spawners can accept faction input now
 2021-06-07 19:18:13 -04:00
Aronai Sieyes
0028ef1ef0 Merge pull request #10568 from VOREStation/upstream-merge-8111 
[MIRROR] Add Secret ZLevels
 2021-06-07 05:33:52 +00:00
Chompstation Bot
e846fa7b82 [MIRROR] Adds new UI for secure stuff 2021-06-07 05:32:43 +00:00
Aronai Sieyes
d72951047e Merge pull request #10569 from VOREStation/upstream-merge-8115 
[MIRROR] Random mob spawners can accept faction input now
 2021-06-07 05:13:13 +00:00
Aronai Sieyes
6d2fe93052 Merge pull request #10567 from VOREStation/upstream-merge-8104 
[MIRROR] Adds new rocks + resprites mining outcrops
 2021-06-07 05:08:55 +00:00
BlackMajor
58d669bdae Merge branch 'master' into bigdragon 2021-06-04 15:37:20 +12:00
BlackMajor
a373a4177d Missed a thing 2021-06-04 15:13:57 +12:00
Nadyr
03761337c1 Merge pull request #2121 from CHOMPStationBot/upstream-merge-10535 
[MIRROR] Chessboard Holodeck TG-Style.
 2021-06-03 05:17:08 -04:00
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess 
Chessboard Holodeck TG-Style.
 2021-06-02 16:03:06 +00:00
Aronai Sieyes
958558168b Merge pull request #10529 from VOREStation/Fixes/10526 
Fixes #10526
 2021-06-02 16:00:10 +00:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518 
[MIRROR] Ports musical instruments from /tg/
 2021-06-02 02:54:38 -04:00
Nadyr
59fd206160 powder that makes you say yes 2021-06-02 00:34:43 -04:00
Nadyr
4fba3e19fb delete yw file conflicting with upstream music changes 2021-06-02 00:21:18 -04:00
Nadyr
9b16a6cd41 powder that makes you say yes 2021-06-01 23:36:59 -04:00
Nadyr
095156f9e4 powder that makes you say yes 2021-06-01 23:35:20 -04:00
Nadyr
6042b29b89 Merge pull request #2105 from CHOMPStationBot/upstream-merge-10409 
[MIRROR] explo vender stuff
 2021-06-01 23:09:30 -04:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 14:58:32 +00:00
Verkister
cc4b02ee77 Fixes belly inits for maintpreds/morphs 
Maintpreds and morphs now spawn with their provided vorgans without getting the vorepanel to replace it with an incomplete set of the char slot vorgans.
 2021-06-01 11:10:25 +03:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Nadyr
b08be80408 Merge pull request #2088 from CHOMPStationBot/upstream-merge-10412 
[MIRROR] Adds gender TF chemicals + Spontaneous TF pref
 2021-05-31 03:45:32 -04:00