Commit Graph

29194 Commits

Author SHA1 Message Date
FartMaster69420
bc85d8eac4 Update weapons_vr.dm 2022-04-11 20:25:45 -04:00
FartMaster69420
0ed24be8dd Cleanup testcode 2022-04-11 20:17:24 -04:00
FartMaster69420
4d1e0e4a51 Initial 2022-04-11 18:21:02 -04:00
Casey
a5c421eef7 Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean
Xenobio Upgrades
2022-04-11 15:23:49 -04:00
FartMaster69420
2c0622cd24 Cleanup 2022-04-10 15:16:44 -04:00
FartMaster69420
5c3d888cbe Sapience Animal Nom
Gives the animal nom verb to sapient critters, even if they are not vore mobs.
2022-04-10 14:42:18 -04:00
FartMaster69420
bb015daad3 Update xenobio_toys_vr.dm
this is why I shouldn't code late at night
2022-04-09 23:12:42 -04:00
FartMaster69420
d0032979d4 Update weapons_vr.dm
Whoops
2022-04-09 23:05:04 -04:00
FartMaster69420
05c5d5f44a Update weapons_vr.dm
Fixing a derp
2022-04-09 22:59:32 -04:00
FartMaster69420
12af0b93bb Update weapons_vr.dm
Heck, how'd I miss this
2022-04-09 22:45:07 -04:00
FartMaster69420
cd9c7fab9e Cleanup
Removing cut content
2022-04-09 22:27:33 -04:00
FartMaster69420
d220b9b73d Near final 2022-04-09 22:26:03 -04:00
FartMaster69420
f2a45d1695 Adding recipes to the lathe. 2022-04-09 21:55:46 -04:00
FartMaster69420
f7d3111f2a Portable Grinder and Bag 2022-04-09 18:01:11 -04:00
Heroman
a22c2be869 Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones 2022-04-10 07:35:31 +10:00
VerySoft
26288ff9cf Some final tweaks
Just tidies up a few wires, makes sure tether and SD are ready to be run with some of the new changes to CC and misc

also moves the inside program out of restricted for holodeck
2022-04-09 16:30:09 -04:00
FartMaster69420
dfbdd237de Merge branch 'master' into xenobio-upgrades 2022-04-09 12:53:04 -04:00
VerySoft
cedc6348f7 More map tweaks!
Revamps the dorms and adds bathrooms

Also makes daytime longer than nighttime
2022-04-09 05:14:56 -04:00
Casey
a73f9f3bfe Merge pull request #12682 from Rykka-Stormheart/shep-dev-TGMC-ammo-HUD
TGMC Ammo HUD Earlyport
2022-04-09 00:40:48 -04:00
Casey
13380238fb Merge pull request #12681 from Very-Soft/gbtweaks
Map tweaks!
2022-04-09 00:40:38 -04:00
Heroman
f4d1f825f7 Nerfs gravitons and morphium, adds lots of boards into autolathe 2022-04-09 05:44:36 +10:00
VerySoft
02c3565f46 T W E A K S 2022-04-07 16:58:27 -04:00
Rykka
2bb6c955ba TGMC Ammo HUD Earlyport
Ports over TGMC's Ammo HUD and all relevant code, adapted to work for Polaris's guns. This took me several days, but hey, I learned a bunch. <:
Time to port Aim Mode + Mentorhelp. :3c 
- All guns now have an ammo HUD sprite. If one lacks one, it will be ??? or blank, at which point, make an issue report, as all guns should be working by now.
- Guns will display how many rounds they have left until ammunition runs dry.
- Ammo will only count the casings that CURRENTLY have a projectile in them. This is slightly unrealistic, yes, but it is better and more intuitive for the player. This also enables guns like the revolver to work, given they recycle casings.
- Up to 4 ammo HUDs can be displayed at once, but given we lack TGMC's attachments and guncode, you'll only ever usually see 2. TBD on porting over TGMC guncode. <:
- Ammunition for multiple guns has different colors in the HUD based on what you currently have loaded.
- If you're looking at this later on to add new things. DON'T USE _FLASH IN THE HUD_STATE_EMPTY. THE _FLASH IS ADDED ON BY CODE.
- Grenades have a hud_state, pending us ever porting over a grenade launcher. Rockets ALSO have a hud_state.


Example of Laser/Energy Weapons:
https://i.imgur.com/MGvqGxh.mp4
Captain's Gun:
https://i.imgur.com/Wd0SS3C.gif

Full Test of all weapons:
https://streamable.com/usp4dy

Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/4033
Earlyport of https://github.com/PolarisSS13/Polaris/pull/8513, with adaptations for VORE's files (Specifically the ML3M medigun and cell-loaded weaponry.)

Credit to @SilencedMP5A5 for helping me with sprite names, testing, and making the Full Test video. <3
2022-04-07 01:58:37 -06:00
Casey
5b7871baef Merge pull request #12676 from Runa-Dacino/Mining-Synth
Organic/Synthethic NIFsoft disk functionality split
2022-04-06 23:21:05 -04:00
Runa Dacino
07e9bee973 Organic/Synthethic functionality split
Adds different functionality for when a NIFsoft disk is used on an organic vs synthethic carbon mob.

This is mostly inconsequential, bar for mining NIFsoft, where organics receive respirocytes (as has always been the case), while synthetics receive heat-sink and pressure seals.
2022-04-07 00:08:19 +02:00
Casey
95a8dcf4f1 Merge pull request #12671 from Verkister/patch-113
Makes mobs not spawn with id unless defined so
2022-04-06 17:27:53 -04:00
Pandora
706c9f767d Forgor those bits. 2022-04-06 16:20:55 +01:00
Pandora
0dbc8666af Update ventcrawl.dm 2022-04-06 15:57:44 +01:00
Pandora
3f9b61a0d5 Update catslug.dm 2022-04-06 15:55:52 +01:00
Verkister
e706322e6b Update simple_mob.dm 2022-04-06 15:19:40 +03:00
Verkister
b7ff309b13 Update catslug.dm 2022-04-06 15:18:35 +03:00
Verkister
1033650c66 Makes mobs not spawn with id unless defined so
Makes mob ids only spawn on mobs that should come with them rather than jamming one into every single mouse and cockroach and so on.
2022-04-06 15:16:54 +03:00
Casey
46334f6670 Merge pull request #12668 from GhostActual/explorer_pdas
Explorer PDAs
2022-04-06 04:26:08 -04:00
Casey
a5c9bc4658 Merge pull request #12667 from GhostActual/aurora_bureaucracy
Aurora Bureaucracy
2022-04-06 04:25:12 -04:00
VerySoft
0817629e5d This too 2022-04-06 04:10:23 -04:00
GhostActual
aa24ec99fd Base Commit
forgor
2022-04-06 01:13:21 -04:00
GhostActual
48ce47e16a Fix 2022-04-06 00:28:31 -04:00
GhostActual
cb1f9d4776 Base Commit 2022-04-06 00:16:46 -04:00
VerySoft
65e1706c24 ACTUALLY fix that ventcrawl. >:C 2022-04-05 22:31:20 -04:00
Casey
6dff41386c Merge pull request #12663 from Very-Soft/ventcrawls
Allow mobs to ventcrawl with their mobid
2022-04-05 22:14:52 -04:00
Casey
592c8441de Merge pull request #12662 from GhostActual/donk-pockets
New Donk-pockets
2022-04-05 22:11:48 -04:00
VerySoft
d191eb73af Allow mobs to ventcrawl with their mobid
Also lets drones vent with their emissive blockers
2022-04-05 22:06:24 -04:00
GhostActual
99eaf5f21b Base Commit
Secondary Commit
Third Commit
2022-04-05 21:39:23 -04:00
Casey
a01915aba9 Merge pull request #12656 from VOREStation/upstream-merge-8494
[MIRROR] Fixes runtime with turrets and viscerators
2022-04-05 20:17:16 -04:00
Spookerton
6dfc5c2db1 Merge pull request #8494 from Verkister/patch-90
Fixes runtime with turrets and viscerators
2022-04-05 14:45:38 -04:00
FartMaster69420
c84184efba RTEG Parts replacer
Allows RPEDs to upgrade RTEGs and their children (REGs included)
2022-04-05 10:32:29 -04:00
Casey
9a12d58405 Merge pull request #12636 from GhostActual/aurora-port-1
Hypospray Revamp
2022-04-04 16:01:53 -04:00
GhostActual
937e8303f3 Base Commit 2022-04-04 15:43:46 -04:00
Pandora
77e39ed5b6 Add files via upload 2022-04-04 20:42:13 +01:00
Pandora
b250b5963b Add files via upload 2022-04-04 20:41:26 +01:00