Commit Graph

74616 Commits

Author SHA1 Message Date
Nadyr
a229a4a615 Merge pull request #6079 from TheGreatKitsune/Shadekin-phase-nerf
Nerf shadekin phasing, add gentle phasing
2023-04-16 00:02:48 -04:00
Nadyr
c19fc71b85 Merge pull request #6080 from Sharkmare/Drone-Ref
Drone code restructure
2023-04-16 00:02:11 -04:00
Nadyr
9d53565799 Merge pull request #6072 from Verkister/garbobutton
Couple more recycling tweaks
2023-04-15 21:11:23 -04:00
Nadyr
5fcb52dae1 Merge pull request #6032 from Raeschen/slosh
increase max belly liquid capacity to 300
2023-04-15 20:45:15 -04:00
Nadyr
4bddb13c2b Merge pull request #6008 from Sharkmare/patch-22
nukes closing statements for rows and cells
2023-04-15 20:41:42 -04:00
Nadyr
dadae51b1d Merge pull request #6000 from FluffMedic/BehemothRework
Behemoth Rework and Loot
2023-04-15 20:40:24 -04:00
CHOMPStation2
9d99039747 Create SECURITY.md 2023-04-15 23:40:18 +00:00
Heroman3003
47f956d930 Merge pull request #14782 from VOREStation/Arokha-patch-1
Create SECURITY.md
2023-04-15 23:40:18 +00:00
Heroman3003
5527605642 Lipozine Plus 2023-04-15 23:16:37 +00:00
CHOMPStation2
4fb206e58a Update food_drinks.dm 2023-04-15 11:16:09 +00:00
Heroman3003
145abcf17f Merge pull request #14796 from KillianKirilenko/kk-robooze
Update food_drinks.dm
2023-04-15 11:16:09 +00:00
Verkister
b1093dee4d Update holder_vr.dm 2023-04-15 13:28:36 +03:00
CHOMPStation2
40a076a3b0 Adds PrettyBuild to Tasks for VSCode 2023-04-15 04:18:30 +00:00
Heroman3003
7daa7c03d9 Merge pull request #14778 from Gurgstation/Tguibuildfix
Adds PrettyBuild to Tasks for VSCode
2023-04-15 04:18:30 +00:00
TheGreatKitsune
e38ee2a935 Add Undergarment TF mode to vore sprites. 2023-04-14 19:13:59 -05:00
Heroman3003
71c7d84701 Fixes simple_mob ID giving system 2023-04-14 22:38:41 +00:00
CHOMPStation2
f03b7ab0e0 Concussion Maul 2023-04-14 22:38:34 +00:00
Heroman3003
d10da6fb22 Merge pull request #14767 from KillianKirilenko/kk-shockmaul
Concussion Maul
2023-04-14 22:38:34 +00:00
kcin2001
8adc18249d add new sect drone wing and head only tyranid marking 2023-04-14 12:53:35 -07:00
LukasJuergens
0efee21dc6 Add the new capture crystal to the "Bits and Bobs" vendor.
Also fixed a typo in the crystals description.
2023-04-14 18:35:54 +02:00
Verkister
4ed126a3e9 Fixes mob holders
Thanks for that "intended feature" upstream.

Fixes mob holders being non-transferable from the person holding them and insta-dumping the mob on the ground instead of functioning.
2023-04-14 17:51:13 +03:00
Sharkmare
fdb661d60c Support blanking the module again + tgui blanking with . 2023-04-14 10:22:52 +02:00
CHOMPStation2
cfeed8be32 Commonwealth/Talon Taursuits 2023-04-14 05:31:58 +00:00
Heroman3003
d57c1dd1c5 Merge pull request #14780 from KillianKirilenko/kk-cmwsuits
Commonwealth/Talon Taursuits
2023-04-14 05:31:58 +00:00
CHOMPStation2
a544d8aaa8 New gaiters when attached 2023-04-14 05:30:51 +00:00
Heroman3003
fb9637f6c8 Merge pull request #14786 from KillianKirilenko/kk-masks
New gaiters when attached
2023-04-14 05:30:51 +00:00
CHOMPStation2
e16f2e4ff9 Fixes some Vox suits from having missing icons in Security 2023-04-14 05:30:46 +00:00
Heroman3003
386aa83743 Merge pull request #14783 from Gurgstation/secsuitvoxfix
Fixes some Vox suits from having missing icons in Security
2023-04-14 05:30:46 +00:00
CHOMPStation2
2240e1d858 Allows Raptor pAI to recolor 'eyes' 2023-04-14 05:30:41 +00:00
Heroman3003
41920c4a36 Merge pull request #14784 from kcin2001/Raptor-Eyes
Allows Raptor pAI to recolor 'eyes'
2023-04-14 05:30:41 +00:00
TheGreatKitsune
044628c9dd Actually fix the things 2023-04-13 18:24:43 -05:00
Sharkmare
df2d7f67e6 closing html tags 2023-04-13 14:33:03 +02:00
Sharkmare
36d7772d67 Malf Drone POI support
Add support for POI
2023-04-13 14:28:53 +02:00
Sharkmare
db980c6f1d Further restructuring 2023-04-13 12:29:58 +02:00
Sharkmare
74b30d0157 Clarify bitwise inverter for compiler 2023-04-13 12:00:15 +02:00
Sharkmare
5ad4e7eb17 Forgot DC doesnt like relative paths 2023-04-13 11:56:10 +02:00
Sharkmare
f1330a3ebd Move drones to modular + changes
Moves drones into the modular folder to allow for more violent changes without having to worry about upstreams potentially adding something to regular drones.

Restructures some of drone code a bit to be nicer in my oppinion

Still needs a second pass at some point but hey if you never start
2023-04-13 11:48:05 +02:00
TheGreatKitsune
4015bbe8dc Nerf shadekin phasing, add gentle phasing 2023-04-12 20:20:12 -05:00
Razgriz
b8a9f86017 Merge pull request #6077 from FluffMedic/BrokenStation
Fixing Dorm 2's Light
2023-04-11 15:41:24 -07:00
FluffMedic
382f730569 Merge branch 'CHOMPStation2:master' into BrokenStation 2023-04-11 18:22:32 -04:00
Fluff
c135cd0678 Fixing Dorm 2 Lights
Adds a light switch to dorms 2.
2023-04-11 18:20:52 -04:00
Sharkmare
02eb0bdca5 Keeping track of how many recyclings happaned
It's that grindset mindset
2023-04-11 17:53:12 +02:00
Verkister
5471c551d8 Merge branch 'master' into garbobutton 2023-04-11 14:13:07 +03:00
Verkister
4b3b635ebf no item acid effect on itemsafe modes 2023-04-11 14:11:15 +03:00
Sharkmare
0a91f3a1f3 Codename Flipper
Illegal PAI system Vix

Personal Assistant, Hacking Multitool, all in one companion for penetration testing
2023-04-11 11:12:04 +02:00
Nadyr
3c576a785c Merge pull request #6068 from CHOMPStation2/upstream-merge-14765
[MIRROR] Adjusts sectors to have real_icons
2023-04-11 01:21:40 -04:00
Nadyr
93f348f2d4 Merge pull request #6067 from CHOMPStation2/upstream-merge-14769
[MIRROR] Fixes pizza guy visor
2023-04-11 01:11:58 -04:00
Nadyr
dae348c0c9 Merge pull request #6066 from CHOMPStation2/upstream-merge-14770
[MIRROR] Adds verb to AR glasses to toggle vision planes
2023-04-11 01:11:08 -04:00
Nadyr
3439bbe48e Merge pull request #6065 from CHOMPStation2/upstream-merge-14772
[MIRROR] Adds Mira's health services medal
2023-04-11 01:09:46 -04:00
Nadyr
a8578766a9 Merge pull request #6064 from Sharkmare/patch-32
Death Alert EMP Activation is now a Probability
2023-04-11 01:09:13 -04:00