Commit Graph

2239 Commits

Author SHA1 Message Date
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727
[MIRROR] Medicine Tweaks
2021-06-26 13:24:46 -07:00
Verkister
8d0899b925 Fixes shower overlays
Mirrorbot whoopsied again.
2021-06-25 13:56:13 +03:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -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
Novacat
d8bc9dec51 Merge pull request #10684 from Novacat/nova-basicfixes
Fixes Field Medic Lockers
2021-06-18 18:02:30 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00: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
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
BlackMajor
95451ea9c5 Update event_vr.dm 2021-06-10 09:23:35 +12: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
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
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
9b16a6cd41 powder that makes you say yes 2021-06-01 23:36:59 -04: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
a0e3679020 Adds gender TF chemicals + Spontaneous TF pref 2021-05-30 23:00:43 +00:00
Novacat
bc43cc2c67 Merge pull request #10489 from VOREStation/upstream-merge-8109
[MIRROR] Misc Bits
2021-05-29 19:10:43 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433
[MIRROR] [MIRROR] Linter Introduction + Cleanup
2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Novacat
cb50662968 Merge pull request #10429 from Very-Soft/windowtintswitch
Replaces window tint button sprite
2021-05-26 01:45:08 +00:00
Nadyr
ab64d36f4c Merge pull request #2001 from CHOMPStationBot/upstream-merge-10382
[MIRROR] Add mapping units/beacons for explo
2021-05-23 23:05:44 -04:00
Novacat
9f795e904f Merge pull request #10396 from VOREStation/upstream-merge-8093
[MIRROR] Wall Locker Adjustments
2021-05-24 02:50:17 +00:00
Chompstation Bot
4d73aa5aca Add mapping units/beacons for explo 2021-05-22 21:48:00 +00:00
Nadyr
67b36900c5 Merge pull request #1988 from CHOMPStationBot/upstream-merge-10342
[MIRROR] Adds some fennec treats
2021-05-21 19:00:34 -04:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Nadyr
4764d593cb Merge pull request #1975 from CHOMPStationBot/upstream-merge-10339
[MIRROR] Ports the Baystation Pilot Helmets
2021-05-19 10:06:27 -04:00
Chompstation Bot
c4aaf54601 Ports the Baystation Pilot Helmets 2021-05-18 12:34:21 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2
Explorer/Pilot ID & Locker Addons
2021-05-17 16:55:19 +00:00
Nadyr
e157d0bf79 Merge pull request #1939 from CHOMPStationBot/upstream-merge-10257
[MIRROR] Changes some Exploration Colors
2021-05-11 23:56:27 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
2027165318 Merge pull request #10257 from Novacat/nova-ert
Changes some Exploration Colors
2021-05-11 13:07:03 +00:00
Nadyr
b5566ff403 Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268
[MIRROR] Adds a big batch of mobs to maint pred pool
2021-05-09 07:47:25 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236
[MIRROR] Toys expansion
2021-05-08 23:50:05 -04:00
Chompstation Bot
78593f1c11 Adds a big batch of mobs to maint pred pool 2021-05-09 01:37:07 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 14:42:49 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Chompstation Bot
2856028342 Captain's Rapier 2021-04-20 16:50:56 +00:00
Darlantan
6806e7d9b5 Implanter, raccoons 2021-04-13 04:31:10 -04:00
Novacat
93b480e5fb Merge pull request #10149 from Novacat/nova-ert
Replaces old pilot helmets
2021-04-13 02:39:37 +00:00
Chompstation Bot
413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00