Commit Graph

2220 Commits

Author SHA1 Message Date
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
Nadyr
4cbf330a93 Merge branch 'master' into upstream-merge-10055 2021-04-03 00:25:44 -04:00
Razgriz
e9cfca5370 Update misc_vr.dm 2021-03-31 02:18:45 -07:00
Chompstation Bot
088d05245d [MIRROR] Tesh gliding tweaks. 2021-03-31 09:14:30 +00:00
Nadyr
452671247c Update trash_pile_vr.dm 2021-03-30 02:54:11 -04:00
Razgriz
13a9e0c94a Update event_vr.dm 2021-03-24 23:05:42 -07:00
Razgriz
5e18aaed38 Event update
Fixes Gravity event. Also adds landmarks to the map that enables the maints pred event.
2021-03-24 23:03:24 -07:00
Chompstation Bot
07dcf04408 [MIRROR] Fixes Global and Fixes Eyes 2021-03-18 14:40:07 +00:00
Nadyr
c6d02615d7 Merge pull request #1574 from CHOMPStationBot/upstream-merge-9913
[MIRROR] Adds a new maint pred mob
2021-03-12 01:48:23 -05:00
Novacat
9645893750 Merge pull request #9913 from Heroman3003/sect-drone
Adds a new maint pred mob
2021-03-11 14:48:27 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Chompstation Bot
a459be5696 [MIRROR] Adds some new wheelchair types 2021-03-09 16:29:51 +00:00
Nadyr
5b0fbb29d5 Merge pull request #1520 from CHOMPStationBot/upstream-merge-9868
[MIRROR] Gateway for Heads, Pilot to Civ
2021-03-08 23:30:54 -05:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit
Adds HYPER suit
2021-03-08 16:06:23 +00:00
Chompstation Bot
cacb1f019d Gateway for Heads, Pilot to Civ 2021-03-08 16:05:16 +00:00
Novacat
8be1af3b62 Merge pull request #9849 from Heroman3003/striptease-yeah-baby
Makes dance poles (de)constructible
2021-03-04 18:57:20 +00:00
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