Commit Graph

2234 Commits

Author SHA1 Message Date
Killian
47cd96b3bb miscellaneous updates 2020-08-04 11:23:19 +01:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Unknown
69d12b8382 I was thinking in a different language 2020-08-01 16:50:05 -04:00
Unknown
a7fb47de9c Structure/Machinery exploit fix 2020-08-01 16:40:17 -04:00
Repede
5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
Also readds vore monkeys
2020-07-26 12:48:22 -04:00
izac112
93083fc58b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 04:53:18 +02:00
izac112
390441705b unit tests 2020-07-25 15:52:25 +02:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
2020-07-25 00:44:51 -07:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires
# Conflicts:
#	code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:34:13 -04:00
Novacat
cdeb6b73cc Update supply.dm 2020-07-22 18:02:16 -04:00
Unknown
382e676ee2 Compatability fixes 2020-07-22 17:37:47 -04:00
ShadowLarkens
7453f64833 Adjusted some colors to make it more legible, added alien multitool magic 2020-07-22 01:03:00 -07:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Cerebulon
4a87460ba8 Flavour Enhancement: Crates 2020-07-21 22:20:30 -04:00
SplinterGP
7a2de0520d Weapons changes 2020-07-20 22:12:01 -03:00
ShadowLarkens
a20eef5bfb TGUI Camera Console - Part 1; Plain console done
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
2020-07-16 16:17:36 -07:00
ShadowLarkens
1cded01770 TGUI v3.0
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
2020-07-16 14:59:45 -07:00
izac112
a1caeb72bd Updates the belter and adds radio pack crate 2020-07-16 17:25:40 +02:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added
Now onto the bugfixing nightmares!
2020-07-16 00:37:22 -04:00
izac112
0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02:00
Novacat
144024b029 Update munitions.dm 2020-07-14 01:17:10 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Killian
6b6f561f33 Streamlined Voidsuits Upgrade (#7300)
* veymed voidsuits upgrade

* unathi streamlined suit polish

* link to #7301

removes the specific checks from SSU.dm and adds no_cycle

* teshari subtype
2020-07-08 21:21:29 -04:00
Luke Vale
aae26a2b54 more screaming 2020-07-04 04:03:19 -05:00
Luke Vale
8221cbc4ad Adds in the files because I'm a dummy 2020-07-04 01:25:23 -05:00
SplinterGP
2424a9f6d7 More autolathe fixes and icon stuff 2020-06-23 22:01:48 -03:00
SplinterGP
bc5d25c208 autolathe fixes 2020-06-22 22:55:58 -03:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Aronai Sieyes
e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00
Unknown
19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
lbnesquik
41b9c802a7 Actually put two in the crate. 2020-06-11 04:24:36 +02:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
2020-06-11 04:14:54 +02:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Unknown
8d170c8468 Removes Exploration Weapon Permits 2020-06-02 19:35:36 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
d3b1b10f4c Merge pull request #8109 from Novacat/nova-ert
Adds Explorer weapons to Uplink
2020-05-28 18:21:48 -04:00
Unknown
bd1fbd13b5 Adds Explorer weapons to Uplink
Mostly adding a lil bit of variety. Holdout is equal to egun and Frontier carbine equal to laser carbine.
2020-05-28 17:10:52 -04:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00