Commit Graph

3364 Commits

Author SHA1 Message Date
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Atermonera
02d8653734 Merge pull request #7949 from Meghan-Rossi/e-cig
E-cigarette improvements
2021-03-10 13:51:46 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -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
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05: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
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
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
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
H0lySquirr3l
c6b757f5f6 Add files via upload 2021-02-23 17:47:38 -06: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
Aronai Sieyes
eee1ce7c04 Don't call attack_self programatically on this 2021-02-17 09:57:31 -05:00
Verkister
f0c93910b6 Fixes explorer shield light runtime spam
Hnngh.
2021-02-16 21:49:51 +02:00
Verkister
d504a206f7 Fixes malf airtank runtime spam
who needs station exploding tank bombs when an empty tank can bomb the server itself
2021-02-16 01:12:05 +02:00
Schnayy
1bb3113428 Allows custom-selection of posters 2021-02-12 14:43:08 -05:00
Verkister
f4442f6080 Merge pull request #9017 from ShadowLarkens/rpd_obtainable
Add Rapid Pipe Dispenser to R&D
2021-02-11 15:27:38 +02:00
H0lySquirr3l
e95498cdd3 Add files via upload 2021-02-10 13:27:21 -06:00
Verkister
b435e756c9 Makes bellied eggs relay their struggles onto the belly. 2021-02-01 15:13:33 +02:00
Verkister
7b1c399a73 Eggy reworks and fixes 2021-01-29 14:55:17 +02:00
Verkister
af25a1b592 New advanced Egg Release mechanics.
-The vore release eggs are no longer reskinned lockers, but storage items that can have their contents either dumped or pulled out, but the stuff can't be put back into a cracked shell.
-A live prey in an egg will have the egg scaled according to their size, and they can get out by resisting.
-Also now items can be egged, either one at a time or all at once. The single item eggs are scaled according to the contained item's size class and take the same amount of storage space as the item itself would.
-Full stuff eggs are a little more lenient on the size and weight, basically for the reason that one prey's full outfit could fit in one backpack sized egg rather than going full macro based on the total weight.
-Also there's a whole bunch of new egg type options and some better looking sprites coming.
-Also the new eggs can be picked up and even trash-eaten.
-The old locker eggs still exist in the code and can be spawned should anyone have a need for one.
2021-01-28 13:34:18 +02:00
Mechoid
ea73111f61 Industrial Expansion 2021-01-27 23:30:50 -05:00
Mechoid
02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Mechoid
40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
VerySoft
86478b6303 ITG IDs and a small Dauntless refit 2020-12-22 19:30:02 -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
Atermonera
dd1abf42c8 Merge pull request #7777 from Verkister/patch-58
Modular honks
2020-12-07 20:10:39 -05:00
Hatterhat
7ed50074aa polaris#7778 earlyport 2020-12-07 01:34:32 -06:00
Novacat
612f187ef6 Update twohanded.dm 2020-11-19 19:45:26 -05:00
Mechoid
a62f766bb5 Kaleidoscope 2: The Retabbening 2020-11-19 13:06:10 -05:00
ShadowLarkens
81e70a3c4d Merge remote-tracking branch 'upstream/master' into upstream-merge-7454 2020-11-13 23:13:01 -08:00
Shadow-Quill
a82521cab5 No more unnearsightedness! (#7753)
* No more unnearsightedness!

* Oops

* Oops pt 2
2020-11-04 13:27:03 -05:00
Atermonera
cf5f84f711 Adds AlliCo Grab-A-Gift 2020-10-30 00:49:05 -04:00
Verkister
44830393fc Merge pull request #9225 from VOREStation/upstream-merge-7708
[MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 10:15:15 +02:00
Meghan-Rossi
3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726)
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 06:06:15 -04:00
Meghan-Rossi
de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04:00
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660
[MIRROR] Fix duplicate results from analyzing some objects
2020-09-21 16:54:29 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00