Commit Graph

8841 Commits

Author SHA1 Message Date
MistakeNot4892
37717fe7b2 Tachikoma tweaks. (#7988)
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
BillyBangles
1b3e00be7e Makes custom cigarettes even more custom-ier (#7925)
* can now add multiple items to rolling papers

* adds blunt wraps and blunts

* un-scuffs the scuffed code
more scuffed up than a wooden middle school gym floor after a dodgeball game

* further optimization
2021-03-19 03:22:19 -04:00
Novacat
6639eb9d30 Merge branch 'master' into upstream-merge-7935 2021-03-18 10:42:23 -04:00
Novacat
7646d7ad05 Merge pull request #9960 from VOREStation/upstream-merge-7974
[MIRROR] Added Doctress' Jager drink.
2021-03-18 10:39:37 -04:00
Novacat
dd01ae71ab Merge pull request #9961 from VOREStation/upstream-merge-7976
[MIRROR] Fixes Global and Fixes Eyes
2021-03-18 10:39:27 -04:00
Novacat
96173e6fc2 Update items.dm 2021-03-18 10:28:35 -04:00
Atermonera
da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Novacat
1536b98caa Fixes Global and Fixes Eyes 2021-03-18 04:51:04 -04:00
Atermonera
3be2f30df2 Added Doctress' Jager drink. 2021-03-18 04:37:30 -04:00
Atermonera
20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Heroman
124a357e65 Adds a new maint pred mob 2021-03-11 17:49:37 +10:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Novacat
5b249903d4 Merge pull request #9894 from VOREStation/upstream-merge-7955
[MIRROR] Adds an advanced version of the mining drill scanner.
2021-03-10 14:17:21 -05:00
Atermonera
26be40158e Merge pull request #7955 from FenodyreeAv/MiningScanner
Adds an advanced version of the mining drill scanner.
2021-03-10 13:59:00 -05:00
Atermonera
02d8653734 Merge pull request #7949 from Meghan-Rossi/e-cig
E-cigarette improvements
2021-03-10 13:51:46 -05:00
Novacat
b782fed522 Merge pull request #9867 from VOREStation/upstream-merge-7928
[MIRROR] Added a GPS compass.
2021-03-09 17:58:49 -05:00
Unknown
620da227bd Resets GPS.dm 2021-03-09 17:43:49 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00
Novacat
a4dfb9c97b Merge branch 'master' into upstream-merge-7756 2021-03-09 15:24:53 -05:00
Novacat
465b3ed92f Merge pull request #9869 from VOREStation/upstream-merge-7921
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 15:16:52 -05:00
Novacat
cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair
Adds some new wheelchair types
2021-03-09 01:14:49 -05:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 11:52:46 -05:00
Novacat
fcc45a8c41 Merge pull request #9865 from Heroman3003/sizespace-suit
Adds HYPER suit
2021-03-08 11:05:22 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman
5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10:00
FenodyreeAv
efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Unknown
f2557a4834 Gateway for Heads, Pilot to Civ
- Adds gateway access to all heads of staff
- Moves pilot to Civilian department, though for PTO purposes they still count as exploration.

This is the result of some staff discussions.
2021-03-07 15:02:48 -05:00
Atermonera
964714e6ba Added a GPS compass. 2021-03-07 14:16:58 -05:00
Heroman
ecb982e6e9 Reworks bluespace suit, adds redspace suit 2021-03-07 14:08:25 +10:00
Heroman
34e78e477d Removes outdated comments 2021-03-07 06:12:38 +10:00
Heroman
4c67f0a286 Removes advantage macrotaurs have with saddlebag slowdown. 2021-03-07 06:10:57 +10:00
Heroman
4fae5b2714 Makes dance poles (de)constructible 2021-03-05 04:43:06 +10:00
Unknown
41f4948621 Earlyports Stair fix from Polaris
https://github.com/PolarisSS13/Polaris/pull/7943
2021-03-02 17:13:14 -05:00
Mechoid
f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown
e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
Novacat
208e6ee06d Update objs.dm 2021-02-27 13:31:02 -05:00
Novacat
087318dc60 Update cliff.dm 2021-02-27 13:08:17 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat
acda75223e Revert "Moar Typo Fixy" 2021-02-26 00:34:18 -05:00
TheFurryFeline
b3c7746e9f Moar Typo Fixy
Fix a descstring for Pizza Voucher having "both" twice. Do tell me if this double was intentional, and will pass along to player who pointed this out to me.
2021-02-25 19:31:57 -05:00
H0lySquirr3l
c6b757f5f6 Add files via upload 2021-02-23 17:47:38 -06:00
Unknown
bd9816c4c0 Reverts trash pile changes 2021-02-20 14:32:17 -05:00
Unknown
2d07f1ac1f Emag Changes
- Trash pile Emags are a lot rarer now.
- Gun Permits are no longer gamma trash pile loot
- You can now find out how many uses are remaining on an emag
- Adds a 'used' variant of emag for adminbus purposes
2021-02-20 13:28:02 -05:00
H0lySquirr3l
80f0de4b9d Update manuals_vr.dm 2021-02-18 19:03:38 -06:00
H0lySquirr3l
7004a93b71 Update manuals_vr.dm 2021-02-18 18:57:44 -06:00
H0lySquirr3l
7f7e867528 Update manuals_vr.dm 2021-02-18 18:56:38 -06:00
H0lySquirr3l
a73975ba4b Add files via upload 2021-02-17 13:11:36 -06:00