Commit Graph

13680 Commits

Author SHA1 Message Date
Heroman3003
6253051c21 Merge pull request #16598 from Kashargul/protRig
Prot rig up port
2024-12-07 05:04:29 +10:00
Heroman3003
60fd487c76 Merge pull request #16655 from Kashargul/jobtitle
tragedian gets its name back
2024-12-07 05:04:05 +10:00
Kashargul
56c53e72fe Merge branch 'master' into protRig 2024-11-30 15:00:57 +01:00
Heroman3003
a15578d8fd Merge pull request #16597 from Kashargul/miscGripper
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
Heroman3003
6a78aaa65a Merge pull request #16653 from KillianKirilenko/kk-sdspawns
Space Ghost and SD Mining spawn tweaks
2024-11-30 14:41:11 +10:00
Heroman3003
38e4aa874b Merge pull request #16648 from ShadowLarkens/paicard
Allow pAIs to attack_ai the machine they're inside,
2024-11-30 14:40:41 +10:00
Kashargul
86c45dd3bc those also need to use apply 2024-11-29 20:36:20 +01:00
Killian
5c81b06c74 space ghost and mining spawn tweaks 2024-11-28 23:33:43 +00:00
Kashargul
07958d0657 Merge branch 'master' into protRig 2024-11-28 15:57:44 +01:00
Heroman3003
10de4fc09f Merge pull request #16511 from VOREStation/verb-subsystem
Verb manager subsystem & Speech controller
2024-11-28 14:43:53 +10:00
Heroman3003
f552b4bdde Merge pull request #16624 from Kashargul/RS_Ports
Ports RS 658, 661 and some minor things
2024-11-28 14:39:22 +10:00
Kashargul
2fdde73d3a Merge branch 'master' into protRig 2024-11-27 23:58:52 +01:00
Kashargul
938ab8af7c Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects 2024-11-27 23:53:06 +01:00
Heroman3003
6f020343bb Merge pull request #16650 from Heroman3003/thanksgivingturkey
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:53:12 +10:00
Heroman
0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
Heroman3003
fa5a178010 Merge pull request #16515 from ShadowLarkens/zas
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
Heroman3003
8d70180e87 Merge pull request #16588 from ShadowLarkens/merk_skills
Completely merk all traces of the skill system
2024-11-28 05:34:18 +10:00
Heroman3003
5cd0d2afd1 Merge pull request #16646 from ShadowLarkens/microwave
Add emotes to ding and make microwave noises.
2024-11-28 05:30:47 +10:00
ShadowLarkens
34be5fef53 Add emotes to ding and make microwave noises. 2024-11-25 07:33:59 -08:00
ShadowLarkens
51653714f6 Allow pAIs to attack_ai the machine they're inside, this literally just means rn microwaves can be triggered by them 2024-11-24 11:22:09 -08:00
Kashargul
3dc0636ebb no old spans 2024-11-23 19:01:23 +01:00
VerySoft
c7563c7e7a fix up types 2024-11-21 01:47:38 -05:00
VerySoft
617f882b50 Turkey 2024-11-21 01:39:56 -05:00
Kashargul
bdf69b5390 fix that real quick as well 2024-11-20 10:55:00 +01:00
Kashargul
a4f0443aae eh let's do that the chomp way to keep it consistent with other phase procs 2024-11-20 10:19:41 +01:00
Kashargul
cb194584aa . 2024-11-20 09:54:02 +01:00
Kashargul
458f28fd1b Ports RS 658, 661 2024-11-20 09:52:28 +01:00
Heroman3003
4c77d88ba7 Merge pull request #16607 from SatinIsle/semi-revert
Potential partial revert to borg self-upgrading restrictions
2024-11-18 07:36:19 +10:00
Heroman3003
56a9b2f34c Merge pull request #16612 from Kashargul/borgFix
cleans up the robot ui code and fixes a runtime
2024-11-18 07:36:02 +10:00
Kashargul
b163fbf439 . 2024-11-17 22:19:04 +01:00
Kashargul
429bd0f980 cleans up the robot ui code and fixes a runtime 2024-11-17 22:14:12 +01:00
SatinIsle
6d7ad6b242 Restricted aghosting to staff
Changed the ghost verb so that it no longer gives the option to aghost to non-staff in some circumstances.
2024-11-17 20:29:25 +00:00
SatinIsle
3d0b040da5 Potential partial revert to borg self-upgrading restrictions
Pending staff discussion.

This reverts the restriction of the borgs from upgrading themselves, for the most part. However, it keeps in place a restriction from them resetting their own module.
2024-11-17 11:25:34 +00:00
Heroman3003
ee770b117c Merge pull request #16605 from SatinIsle/come-fly-with-me
Allows non-custom species to take winged flight
2024-11-17 20:56:00 +10:00
Heroman3003
be27e95840 Merge pull request #16593 from DigitalSquirrel95/patch-8
Removes ability for research cyborgs to self-upgrade
2024-11-17 20:54:28 +10:00
Heroman3003
edb46d85c2 Merge pull request #16589 from Kashargul/moduleSelectionUI
Moving robot module and icon selection to tgui
2024-11-17 20:54:08 +10:00
Heroman3003
d8cf884a0d Merge pull request #16550 from KillianKirilenko/kk-climbs
Climbing/Swimming Trait Tweaks
2024-11-17 20:53:33 +10:00
Heroman3003
47469a1c2d Merge pull request #16539 from KillianKirilenko/kk-rings
Ring/Watch Accessory Transfer
2024-11-17 20:53:14 +10:00
SatinIsle
4774705436 Added 6 new blob forms (#3)
Added 6 new thematically appropriate blob forms:
- A flat shadow
- A cleaner, rounder blob that doesn't move
- A nanite swarm
- A slime with a :] face
- A spikey, electrical thingy
- A cloud
2024-11-16 21:03:26 +01:00
Kashargul
cdebf446e2 Merge branch 'protRig' of github.com:Kashargul/VOREStation into protRig 2024-11-16 20:56:21 +01:00
Kashargul
696c6e41e4 fix that 2024-11-16 20:56:05 +01:00
SatinIsle
5e393410ba Allows non-custom species to take winged flight
Changed Winged Flight to allow all species to take it. Seeing as all species have access to wings, there's no real reason to restrict it.
2024-11-16 15:12:19 +00:00
Kashargul
ec6c112d03 sort the new verb 2024-11-16 13:19:59 +01:00
SatinIsle
e50a4daed0 Removes mob forms for now (#2)
We'd prefer not to have blob form take the form of mobs for now, though that may change in the future, so they are just commented out here.
2024-11-15 23:31:39 +01:00
SatinIsle
fa6566a42c Changes to protean PR (#1)
* Removes darkvision

Removes dark vision changes

* Prevents rig assimilation and allows vent crawl for small items only

Removed the ability to assimilate rigs.

Added the ability to vent crawl back, but it now checks their inventory (including inside the rig storage) for any items over pocket-size.

* Removed unnecessary exception

* 1 -> TRUE and 2 -> ITEMSIZE_SMALL
2024-11-15 20:41:55 +01:00
Kashargul
ba6a5d4038 dmi port 2024-11-13 22:38:36 +01:00
Kashargul
32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +01:00
Kashargul
f0631f085c adds those procs even though currently unused. Chomp has more details in character directory 2024-11-12 21:20:01 +01:00
Kashargul
beb3616853 virgo doesn't have that either 2024-11-12 21:00:11 +01:00
Kashargul
adbfc2482a virgo doesn't have those 2024-11-12 20:58:07 +01:00