Heroman3003
|
e01707ba99
|
Extends entity narrate functionality with TGUI
Rebase to master
|
2023-06-20 15:56:17 +02:00 |
|
Raeschen
|
8e0238bfc5
|
Merge pull request #6369 from ItsSelis/db-mentors
Adding DB Capability for Mentors
|
2023-06-20 08:04:42 +02:00 |
|
Selis
|
241776a181
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-15023' into big-new-tgui-pr
|
2023-06-19 18:33:33 +02:00 |
|
Selis
|
47cb49ef24
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-15024' into big-new-tgui-pr
|
2023-06-19 18:30:40 +02:00 |
|
Selis
|
70492e9b37
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14983' into big-new-tgui-pr
|
2023-06-19 18:22:14 +02:00 |
|
Selis
|
ee8dc5f568
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14964' into big-new-tgui-pr
|
2023-06-19 18:21:24 +02:00 |
|
Selis
|
74a7d81715
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14934' into big-new-tgui-pr
|
2023-06-19 18:14:32 +02:00 |
|
Selis
|
261c820373
|
Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14933' into big-new-tgui-pr
|
2023-06-19 18:13:57 +02:00 |
|
Raeschen
|
2dfa96125a
|
Remove KHI
|
2023-06-19 15:17:12 +02:00 |
|
Rykka Stormheart
|
132f622e4c
|
Removes Opacity check from tcomms + smes to reduce hear usage
|
2023-06-19 05:14:44 -07:00 |
|
Raeschen
|
9ae31e501e
|
Merge pull request #6411 from CHOMPStation2/upstream-merge-15043
[MIRROR] Spell Fixes
|
2023-06-19 12:42:37 +02:00 |
|
Raeschen
|
74765cf864
|
fix merge conflicts
|
2023-06-19 12:32:36 +02:00 |
|
Raeschen
|
5599ecb766
|
Merge pull request #6406 from CHOMPStation2/upstream-merge-15031
[MIRROR] Update Pref Options
|
2023-06-19 12:20:17 +02:00 |
|
Raeschen
|
bf6c710049
|
fix merge conflicts
|
2023-06-19 12:16:08 +02:00 |
|
Raeschen
|
602ceeb5c2
|
Merge pull request #6405 from CHOMPStation2/upstream-merge-15017
[MIRROR] Loadout Overhaul
|
2023-06-19 12:13:07 +02:00 |
|
Raeschen
|
de6a048679
|
fix merge conflicts
|
2023-06-19 11:48:24 +02:00 |
|
Raeschen
|
697b0668d9
|
Merge pull request #6404 from CHOMPStation2/upstream-merge-15044
[MIRROR] Adds meat to the nutriment desc of the meatpizza
|
2023-06-19 11:19:42 +02:00 |
|
Raeschen
|
b3b2b9ce80
|
Merge pull request #6403 from CHOMPStation2/upstream-merge-15040
[MIRROR] New Belts and Accessories
|
2023-06-19 11:19:01 +02:00 |
|
Raeschen
|
c92752acfc
|
Merge pull request #6397 from CHOMPStation2/upstream-merge-15036
[MIRROR] Player blobform speed adjustments
|
2023-06-19 11:13:57 +02:00 |
|
Raeschen
|
64558e6f77
|
Merge pull request #6391 from CHOMPStation2/upstream-merge-15022
[MIRROR] Forbidden Tuna
|
2023-06-19 11:10:10 +02:00 |
|
Heroman3003
|
76ebb69fc2
|
tgui no yell
rebase to master
|
2023-06-19 10:49:14 +02:00 |
|
Raeschen
|
650c3d5d42
|
Fix rebase issues
|
2023-06-19 10:29:24 +02:00 |
|
Heroman3003
|
c31abfd985
|
Variety Add-on Patch
rebase to master
|
2023-06-19 10:22:16 +02:00 |
|
Heroman3003
|
820cf1374e
|
Removes eventkit from non-staff browser. fixing bug by doing so
rebase to master
|
2023-06-19 09:46:26 +02:00 |
|
Heroman3003
|
8faab452b1
|
EventKit - Mob Spawner
|
2023-06-19 09:26:04 +02:00 |
|
Raeschen
|
8bc7957b81
|
Merge pull request #6280 from Seris02/diagonalmovement
proper diagonal movement
|
2023-06-19 09:09:31 +02:00 |
|
Raeschen
|
6bd26e380d
|
Merge pull request #6265 from purplefoxy27/in-shoe-steppies
Add inshoe steppies
|
2023-06-19 09:08:59 +02:00 |
|
Raeschen
|
6bddb6e7da
|
Merge pull request #6233 from Verkister/patch-70
Makes object vore little less cringe
|
2023-06-19 09:07:08 +02:00 |
|
Heroman3003
|
db38ed93c0
|
Spell Fixes
|
2023-06-19 04:40:45 +00:00 |
|
purplefoxy27
|
12b156a6e5
|
Add In shoe OOC escape
|
2023-06-18 20:12:29 -07:00 |
|
Heroman3003
|
00c822d64f
|
Update Pref Options
|
2023-06-18 18:48:36 +00:00 |
|
Heroman3003
|
617e2e55b9
|
Loadout Overhaul
|
2023-06-18 18:47:29 +00:00 |
|
Heroman3003
|
a6cc615053
|
Merge pull request #15044 from ItsSelis/meat-pizza-desc
Adds meat to the nutriment desc of the meatpizza
|
2023-06-18 18:43:17 +00:00 |
|
Heroman3003
|
e5bb9e586e
|
Merge pull request #15040 from Youtubeboy139/Belts-And-Stuff
New Belts and Accessories
|
2023-06-18 18:42:07 +00:00 |
|
Raeschen
|
f3dcb3156d
|
Update code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
Co-authored-by: Selis <selis@xynolabs.com>
|
2023-06-18 16:34:23 +02:00 |
|
Raeschen
|
1cffb3f0e7
|
Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds
Sound Additions + Tweaks
|
2023-06-18 16:27:37 +02:00 |
|
Raeschen
|
1f99e6ce53
|
Merge pull request #6329 from CHOMPStation2/upstream-merge-14976
[MIRROR] More 515 Compatibility
|
2023-06-18 14:59:19 +02:00 |
|
Raeschen
|
13c6cfc6ba
|
Update code/modules/events/infestation.dm
Co-authored-by: Selis <selis@xynolabs.com>
|
2023-06-18 14:28:39 +02:00 |
|
Heroman3003
|
228dea8e8c
|
Merge pull request #15032 from silicons/wallflowering
Adds the ability to move through people who are intentionally pixel shifted
|
2023-06-18 08:46:19 +00:00 |
|
Raeschen
|
95bb22134c
|
fix more merge conflicts
|
2023-06-18 10:05:19 +02:00 |
|
Raeschen
|
8faf2de8e7
|
fix merge conflicts
|
2023-06-18 10:05:17 +02:00 |
|
Heroman3003
|
de3515f925
|
Adds per-belly option to vorepanel for switching between sleeper/belly
|
2023-06-18 10:05:16 +02:00 |
|
Heroman3003
|
6ffab8bada
|
Synthetic chassis taur body
|
2023-06-17 23:57:43 +02:00 |
|
Raeschen
|
fd87fd5da1
|
Merge pull request #6367 from Sharkmare/patch-36
Change "Admin Login:"
|
2023-06-17 23:46:46 +02:00 |
|
Raeschen
|
5b6758eb2a
|
Merge pull request #6357 from CHOMPStation2/upstream-merge-15007
[MIRROR] Larger cobra hood
|
2023-06-17 23:44:36 +02:00 |
|
Raeschen
|
48994cada8
|
Merge pull request #6354 from CHOMPStation2/upstream-merge-14987
[MIRROR] Alternate to https://github.com/VOREStation/VOREStation/pull/14959 New Admin verb: Report Player Status
|
2023-06-17 23:32:48 +02:00 |
|
Raeschen
|
bddb482da1
|
Merge pull request #6353 from CHOMPStation2/upstream-merge-14995
[MIRROR] Store your suits and borgs more properly
|
2023-06-17 23:30:15 +02:00 |
|
Raeschen
|
5ecad647ba
|
Merge pull request #6352 from CHOMPStation2/upstream-merge-15000
[MIRROR] Watch your head!
|
2023-06-17 23:11:45 +02:00 |
|
Raeschen
|
3a8f28c2c5
|
Merge pull request #6351 from CHOMPStation2/upstream-merge-14961
[MIRROR] "Hey bud, need a light?"
|
2023-06-17 23:09:05 +02:00 |
|
Raeschen
|
2c5bcc45e0
|
Merge pull request #6349 from CHOMPStation2/upstream-merge-14941
[MIRROR] Time to cool off
|
2023-06-17 23:03:32 +02:00 |
|