Commit Graph

17544 Commits

Author SHA1 Message Date
VerySoft
86478b6303 ITG IDs and a small Dauntless refit 2020-12-22 19:30:02 -05:00
Killian
80cc91483d Update blackbox.dm 2020-12-22 04:21:49 +00:00
Killian
fac4301fd1 Merge remote-tracking branch 'upstream/master' into kk-ships 2020-12-22 04:08:57 +00:00
Killian
365c0b0e77 escape pods and black boxes 2020-12-22 04:08:38 +00:00
Unknown
d5e4c622a8 Minor copypasta error 2020-12-19 21:17:34 -05:00
Unknown
5772b95cc5 Some ERT Tweaks 2020-12-19 21:14:42 -05:00
Unknown
00f1fa2756 Exploration/Gateway Update
- Adds a new Scatter type of gateway, abductor, which strips the person's gear and deposits them somewhere else
- Nerfs Expedition Phasers and Holdout Phasers
- Reduces the number of full size phasers in Exploration from 4 to 3
- Slightly buffs melee mobs
- Removes humanoid mobs from Virgo 3B Wilderness
- Removes ADG from one of the POIs from V2
2020-12-18 16:54:12 -05:00
Novacat
98ff27bbe4 Merge pull request #9453 from Hatterhat/polaris-7785-earlyport
hardsuit borg charger polaris 7785 earlyport
2020-12-13 22:19:13 -05:00
Novacat
6ac06fcc8c Merge pull request #9456 from Very-Soft/longer-bonfires
Makes bonfires last longer!
2020-12-13 22:17:21 -05:00
VerySoft
8ca614dce3 Makes bonfires last longer!
So they should last 60 minutes if filled with logs, and 30 minutes if filled with planks
2020-12-13 21:57:54 -05:00
Hatterhat
f771cc4ce5 RPED QoL Tweak(s)/Unimplemented RPED Variant (#7784)
* this is incredibly scuffed

* this is a monumental W bossman

* parity with downstream

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-13 19:51:54 -05:00
Hatterhat
acfd61e9f4 hardsuit borg charger polaris 7785 earlyport 2020-12-13 13:42:36 -06:00
Matica
6ebab26619 Vending Machine Time 2020-12-11 17:51:18 -05:00
Novacat
03f14f5601 Merge pull request #9435 from Very-Soft/abduct-u2
abduct-u2
2020-12-08 17:36:43 -05:00
VerySoft
8c6f1d0900 abduct-u2 2020-12-08 17:19:24 -05:00
Novacat
162d018f97 Merge pull request #9431 from Very-Soft/abduct-u
Abductor Ship
2020-12-08 13:55:41 -05:00
VerySoft
ff2fb7069e Abduct-u 2020-12-08 13:10:27 -05:00
Novacat
47c4b5f66e Merge pull request #9422 from VOREStation/upstream-merge-7762
[MIRROR] Plainleather & Tobacco
2020-12-07 22:37:38 -05:00
Atermonera
dd1abf42c8 Merge pull request #7777 from Verkister/patch-58
Modular honks
2020-12-07 20:10:39 -05:00
Mechoid
b95a10af1a Plainleather & Tobacco (#7762)
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
2020-12-07 19:50:50 -05:00
Hatterhat
7ed50074aa polaris#7778 earlyport 2020-12-07 01:34:32 -06:00
Unknown
f9c11b6843 Fixes Allinones For Real Part 2
Electric Boogalo now in stores
2020-12-05 16:36:57 -05:00
Unknown
0188850a92 Fixes Allinones for real this time 2020-12-05 15:09:48 -05:00
Verkister
e4b2bcf3e6 Fixes dismantled machines deleting inserted IDs (#7776)
* Fixes dismantled machines deleting inserted IDs

Machines no longer delete people's ID cards whenever they attempt the most obvious route of getting their card back from an unpowered machine.

* Update machinery.dm
2020-12-05 06:16:00 -05:00
Novacat
6d85b4b854 Merge pull request #9393 from VOREStation/upstream-merge-7749
[MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
2020-12-04 20:56:23 -05:00
Unknown
8512f454d3 Fixes some Telecomms stuff
- Allinones now work
- Adds a special ERT allinone for ERT comms
- Fixes comms interception for Antags
2020-12-04 20:13:08 -05:00
Novacat
df3635a85e Merge pull request #9402 from Very-Soft/dauntless
ITG Dauntless
2020-12-03 18:35:44 -05:00
VerySoft
57ddfdfb5b ITG Dauntless
An interstellar freight and passenger frigate owned and operated by the Ironcrest Transport Group! For events and stuff!
2020-12-02 23:31:51 -05:00
Little-119
a10c7fd191 Tintable doors followup 2020-12-02 17:10:12 -05:00
Atermonera
e6c0ecdafa Merge pull request #7749 from Mechoid/StowawayMystery
Stowaway Cryopod is now invisible, and incorporeal.
2020-12-02 02:28:49 -05:00
Novacat
a392c5c80e Merge pull request #9382 from Little-119/tintable-doors
Add tintable doors
2020-11-30 18:46:21 -05:00
Novacat
60217c38ae Merge pull request #9333 from Tenryumi/nikki-fluff
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 18:45:57 -05:00
VerySoft
1fdeabfa29 satisfies Ascian's dangerous need for orderly vorestation edits 2020-11-30 18:09:18 -05:00
VerySoft
4285fa61f8 makeda grass hav grass footstep sounds
and still not have interior edging
2020-11-30 16:19:44 -05:00
Little-119
233df18c97 how did this happen? 2020-11-30 03:00:35 -05:00
VerySoft
ea840a85d2 fix da grass
makes outdoor grass not have the interior grass edging
2020-11-30 01:01:11 -05:00
Little-119
e6a07f52c6 Add electrochromic medical and security airlocks 2020-11-29 15:50:51 -05:00
Little-119
f874a9b3d9 move to vr files 2020-11-29 13:36:57 -05:00
Little-119
1f1f09637e Add tintable doors, but only wide ones 2020-11-29 04:17:42 -05:00
ShadowLarkens
d3044c8739 Merge remote-tracking branch 'upstream/master' into github_actions 2020-11-24 09:56:38 -08:00
Novacat
67fb08e6e2 Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-23 19:54:17 -05:00
Novacat
32936c4657 Merge pull request #9351 from Very-Soft/stagefiddling
adjusts stage plane
2020-11-23 19:38:07 -05:00
VerySoft
847675583a adjusts stage layer 2020-11-23 17:57:49 -05:00
Novacat
80ddfd23be Merge pull request #9349 from Novacat/nova-basicfixes
More ship and turret fixes
2020-11-23 17:18:38 -05:00
Unknown
661d1ecc3c More ship and turret fixes
- Nerfs the Syndicate and ERT ships to just use regular turrets
- Fixes a bug with the ERT ship where a room was not getting power
2020-11-23 16:11:55 -05:00
ShadowLarkens
861bde64d0 Fix #9345
Fixes #9345
2020-11-23 07:03:07 -08:00
Shadow Quill
abaa56292d Early Return 2020-11-22 21:37:21 -06:00
ShadowLarkens
87e0b3653f Move away from Travis CI to GitHub Actions 2020-11-21 18:23:40 -08:00
KasparoVy
b062575363 Ports Cool Stuff from Bastion of Hestia/Vesta
Fully implements DNA-integrated secondary & tertiary colouration for ears, wings and tails.

Adds some new ears, wings, tails and markings from Hestia.

Everything working in mint condition

EVERYTHING
2020-11-21 14:57:44 -05:00
VerySoft
575a57fa54 adds _vr for rel this time maybe 2020-11-20 12:05:15 -05:00