Commit Graph

30221 Commits

Author SHA1 Message Date
C.L
84181ef54e Release Bugfixes and changes (MERGE BEFORE RELEASE) (#13787)
* Add bricks

* Fixes concrete icon spawning.

Polaris uses a different system for spawning turfs than we do. This fixes a bug with concrete spawning.

* Makes it so you have to load PB in a cryo beaker.

Instead of getting it for free.

* no you don't get free reinforcement

* Concrete can make concrete flooring

* Adds concrete tiles. Fixes spawning

* Being plating is boring. Let's make it a floor.

* Able to remove it.

* Allows fun. Fixes infinite tiles.

* Adds Polaris Gun Sprites

- Allows for easier ports.
- Fixes the semi-automatic-shotgun

* Adds the PSGs - Tether. Fixes the sprite in DreamMaker.

- Adds a PSG to the security EVA (Security players mentioned doing this instead of armory, and it makes sense.)
- Adds a PSG to mining equipment room.

* Adds PSGs to SD

- Adds PSG to Security EVA
- Adds PSG to Mining

* Adds PSGs to GB

- Adds PSG to Groundbase Mining
- Adds PSG to Groundbase Security EVA

* Makes the PSG the actual mining version
2022-09-23 01:01:24 -04:00
VirgoBot
d67a95c46f [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010)
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:07:39 -04:00
VirgoBot
6af5b1796a [MIRROR] pool swimwear locker names, holo floor/item names (ABLE TO BE MERGED) (#12920)
* pool swimwear locker names, holo floor/item names

* Update HolodeckObjects.dm

Co-authored-by: Sypsoti <98442665+Sypsoti@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:07:00 -04:00
VirgoBot
67059e3634 [MIRROR] Bartending enhancements (ABLE TO BE MERGED) (#12971)
* Bartending enhancements

* Update glass.dm

* Update drinks.dm

* Update drinks.dm

* Update hospitality.dm

* Update dispenser_presets.dm

* Update dispenser_presets.dm

* Update vending_machines.dm

* Update vending_machines.dm

* Update chemical.dmi

* Revert "Update chemical.dmi"

This reverts commit abc8ba097c.

* Update chemical.dmi

* Update cartridge_presets.dm

* squish

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:05:14 -04:00
VirgoBot
de58b679e2 [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED) (#12899)
* Adds Sjorgen Inertial Shotgun (by H-H)

* Update munitions.dm

* Update visible_weapons.dm

* Update shotgun.dm

* Update guns_and_ammo.dm

* Update munitions.dm

* Update guns_and_ammo.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:05:00 -04:00
VirgoBot
0b39510898 [MIRROR] Cellcharge artifact effect iterates over shorter lists (ABLE TO BE MERGED) (#13507)
* Cellcharge artifact effect iterates over shorter lists

* Update cellcharge.dm

* Update cellcharge.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:04:12 -04:00
VirgoBot
14b7d4d82b [MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165)
* Merge pull request #8655 from MistakeNot4892/traitfix

Skips traits that aren't implemented yet.

* Skips traits that aren't implemented yet.

Co-authored-by: Atermonera <atermonera@gmail.com>
2022-09-22 21:03:37 -04:00
VirgoBot
1a8f1760fa [MIRROR] conk rete (ABLE TO BE MERGED) (#13467)
* conk rete

* Update flooring_premade.dm

* Update wall_types.dm

* Update _materials.dm

* Update plasteel.dm

* Update steel.dm

* Update stone.dm

* Update stone.dm

* Update instant.dm

* Update plasteel.dm

* Fixes map changes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:03:19 -04:00
Casey
c7badae23e Merge pull request #13783 from Kegsey/Sottovoce
Sottovoce Fluff Item
2022-09-22 20:58:57 -04:00
Casey
20ed147503 Merge pull request #13782 from Very-Soft/instadigest
Buffs Vore
2022-09-22 20:58:06 -04:00
Casey
bfa1362da2 Merge pull request #13780 from ItsSelis/tooltips-stuff
Loads jquery from the Server instead of a CDN
2022-09-22 20:57:43 -04:00
Casey
c5d135a815 Merge pull request #13779 from Heroman3003/ascended-fix
Fixes ascended donk pocket
2022-09-22 20:57:31 -04:00
Casey
a061809140 Merge pull request #13778 from Heroman3003/medichines-runtime
Fixes runtime with medichines deletion
2022-09-22 20:57:20 -04:00
Casey
15fc9ab3ff Merge pull request #13777 from Heroman3003/teleport-runtime
Fixes teleport artifact not unbuckling mobs properly
2022-09-22 20:57:09 -04:00
Casey
7daab19fc7 Merge pull request #13776 from Heroman3003/pickup-fix
Fixes micro pick-up temporary toggle to work properly
2022-09-22 20:56:44 -04:00
Casey
eb7ef5fc7c Merge pull request #13774 from Heroman3003/altevian-batch-x
Adds a ton more altevian stuff
2022-09-22 20:56:24 -04:00
Casey
26334b328a Merge pull request #13771 from Heroman3003/hotfood-nerf
Removes hotfood vendors from station spawning
2022-09-22 20:55:28 -04:00
Casey
5b113e56fb Merge pull request #13770 from Heroman3003/borgfix
Fixes dogborg inbuilt belly deaths not counting as vore deaths
2022-09-22 20:55:17 -04:00
Casey
7d6bb4f7ed Merge pull request #13769 from Cameron653/RADIOACTIVE
Radiation Rework
2022-09-22 20:55:08 -04:00
Casey
59e21d704f Merge pull request #13767 from Heroman3003/lang-autosay
Fixes a few bugs/runtimes
2022-09-22 20:54:34 -04:00
Casey
f2fb02756e Merge pull request #13766 from Cameron653/xenoarch_hotfix2
Hotfixes xenoarch tools
2022-09-22 20:54:26 -04:00
Casey
61a333250e Merge pull request #13763 from Heroman3003/ladder
Makes ladder climb time variable
2022-09-22 20:54:11 -04:00
Casey
d105238544 Merge pull request #13762 from Heroman3003/pakkunfix
Fixes pakkun stuff
2022-09-22 20:53:43 -04:00
Casey
b2428a58c5 Merge pull request #13760 from VOREStation/droppred
Makes mob droppred handles on vore init instead of variable on the mob.
2022-09-22 20:53:16 -04:00
Casey
d824f88630 Merge pull request #13759 from Heroman3003/more-fixes-yet
Fixes two more runtimes hopefully
2022-09-22 20:52:59 -04:00
Casey
95138e4672 Merge pull request #13696 from Cameron653/TEST
Adds personal shield generators. [READY FOR MERGE]
2022-09-22 20:52:28 -04:00
VerySoft
73f0efeb4d buffs even more 2022-09-22 16:57:11 -04:00
VerySoft
04a021cfaf buffs vore more 2022-09-22 15:39:59 -04:00
VerySoft
6b2ffe2be3 Buffs Vore
Adds the 'process' option to the list of things you can do to prey in your bellies!

This option will let you pick between digest and absorb, when you pick one, it lets the prey know what you are trying to do and has them confirm! If they confirm and are still in the belly, then that option will instantly happen to them.

The options available to you when you click it are dependent on the prey's prefs, so, if a prey has digest turned off, but absorb turned on, then it will only offer absorb! If they have both disabled, then it will tell you no!

This way if you want to gurg someone up real fast once your scene is done or whatever, you don't have to adjust all your gurg values or whatever.

This does also allow one to SELECTIVELY digest or absorb people even if they are in the same tummy, which I think is very radical.
2022-09-22 13:08:57 -04:00
Cain
70eda17db6 Sottovoce Fluff Item
*internal screaming*

I hope I did this right, no errors seems good!
2022-09-22 17:07:22 +01:00
ItsSelis
69b058b90b (Hopefully) Fixes linter error 2022-09-22 15:11:07 +02:00
ItsSelis
aef7920167 Makes sure to fetch the file before showing the tooltip 2022-09-22 14:58:50 +02:00
ItsSelis
2ebae5edbf Moves jquery from CDN to Local 2022-09-22 10:19:18 +02:00
Heroman
c5349d6b2f Fixes ascended donk pocket 2022-09-22 13:50:17 +10:00
Heroman
55e6fc8f18 Fixes runtime with medichines deletion 2022-09-22 10:01:34 +10:00
Heroman
031f8ede2b Fixes teleport artifact not unbuckling mobs properly 2022-09-22 09:49:44 +10:00
Heroman
16b7a249ac Fixes micro pick-up temporary toggle to work properly 2022-09-22 09:41:33 +10:00
Heroman
b63b72a1cc Typo fix 2022-09-21 15:13:50 +10:00
Heroman
10596cfb1b Adds a ton mroe altevian stuff 2022-09-21 14:59:26 +10:00
Heroman
0123fff2b9 Removes hotfood vendors from station spawning 2022-09-21 08:47:03 +10:00
Heroman
ae33c5964d Fixes dogborg inbuilt belly deaths not counting as vore deaths 2022-09-21 05:32:04 +10:00
C.L
1951a960d9 Removes unnneded todos 2022-09-19 21:18:18 -04:00
C.L
0519828006 Prussian Blue Adjustment 2022-09-19 21:12:04 -04:00
C.L
5d2c9e540b Borrowed time purity hypo 2022-09-19 21:09:28 -04:00
C.L
edd38dd8ff Radiation Rework
- Makes low levels of radiation slower and more insidious. (Low levels of rads only have effects every 5 life ticks.)
- Makes high levels of radiation have varying effects and be much more lethal. (When above 600 rads, effects are done every life tick)
- Makes radiation have lingering effects that can be treated with normal radiation chemicals.
- Adds 'Prussian Blue' a chemical made with '("carbon" = 3, "iron" = 1, "nitrogen" = 3)' that temporarily stops radiation effects to allow for medical to treat a patient.
- Makes medical scanners able to give a definitive answer as to how much rads someone has.
- Makes cryopods handle radiation sickness. Maybe now they'll see more use than just genetic damage.
2022-09-19 20:56:52 -04:00
Heroman
b3a51e0476 Fixes a few bugs/runtimes 2022-09-20 07:38:08 +10:00
C.L
4a74a0c6af go away src. 2022-09-19 12:45:56 -04:00
C.L
8b5ad03bd8 Xenoarch multitool bugfix & src removal
- Fixes xenoarch multitool to not give you a list of all /mob/living in the area

- Removes unneeded .src
2022-09-19 12:42:47 -04:00
C.L
913cf88882 Hotfixes xenoarch tools
- Makes the suspension generator show up properly
- Makes the suspension generator use Polaris's adjustments.
- Disables tools_vr since sprites have been updated.
- Updates xenoarch analyzer sprite to be the proper one.
2022-09-19 12:16:45 -04:00
Heroman
91aae2ae4c Makes ladder climb time variable 2022-09-19 19:02:11 +10:00