Raeschen
52961b6db0
Update mechfab_designs_vr.dm merge conflict
2023-07-02 15:40:43 +02:00
Heroman3003
879a1d4610
Moves BL-3/P design to correct folder
2023-07-01 21:48:57 +00:00
Raeschen
ed75318989
Merge pull request #6471 from tacoguy7765093/nuclear-and-wild
...
Modernizes the nuke code
2023-07-01 09:31:26 +02:00
Raeschen
48280f1bf3
Merge pull request #6479 from kcin2001/belly-light
...
separates out the upper lights onto a separate layer from the liquid
2023-07-01 09:19:29 +02:00
kcin2001
9734f5a63a
separates out the upper lights onto a separate layer from the liquid
2023-07-01 00:15:14 -07:00
BlackMajor
3fc2257e83
Merge pull request #6477 from Aroliacue/aro_wiring
...
Autoresleeving Power Fix
2023-07-01 17:40:23 +12:00
Aroliacue
80c4fd742a
Fixes Wiring
2023-07-01 15:29:28 +10:00
Raeschen
1901a6c9c4
Merge pull request #6476 from Verkister/patch-72
...
Fixes non-human center offset toggle
2023-06-30 20:44:34 +02:00
Verkister
6208b55d5b
Fixes non-human center offset toggle
...
Should fix the preferences tab "switch center offset" toggle not working for non-human mobs. Didn't test because lazy and just a simple 2-line paste oversight anyway.
2023-06-30 21:20:55 +03:00
Raeschen
d9aee66509
Merge pull request #6475 from CHOMPStation2/upstream-merge-15091
...
[MIRROR] Fixes and tweaks "Survivor Pods"
2023-06-29 22:42:21 +02:00
Raeschen
86cc1b078f
Merge pull request #6469 from CHOMPStation2/upstream-merge-15088
...
[MIRROR] Four new pAI chassis
2023-06-29 22:40:52 +02:00
CHOMPStation2
f61a368ffc
Fixes and tweaks "Survivor Pods"
2023-06-28 21:34:39 +00:00
Heroman3003
48926a6afb
Merge pull request #15091 from Runa-Dacino/ghostpodstuff
...
Fixes and tweaks "Survivor Pods"
2023-06-28 21:34:39 +00:00
Razgriz
0f87e4c9e6
Merge pull request #6473 from CHOMPStation2/Rae-freetacticool
...
add tacticool turt to loadout, give sensors
2023-06-28 05:04:18 -07:00
Raeschen
8057db5ba8
oops dme
2023-06-28 13:38:12 +02:00
Raeschen
5e8b9b744e
no armor in loadout
2023-06-28 13:36:51 +02:00
Raeschen
d66c728f05
add tacticool turt to loadout, give sensors
2023-06-28 13:22:45 +02:00
Bib Bob
957a48409e
red instead of blue
2023-06-27 22:33:27 -05:00
Bib Bob
08abcd3f33
modernizes the nuke code
2023-06-27 22:13:47 -05:00
CHOMPStation2
45e1d3921a
Four new pAI chassis
2023-06-28 00:28:47 +00:00
Casey
9c571fe03d
Merge pull request #15088 from scarletflared/master
...
Four new pAI chassis
2023-06-28 00:28:46 +00:00
Raeschen
81bb44b7e8
Merge pull request #6466 from CHOMPStation2/upstream-merge-15086
...
[MIRROR] Map
2023-06-27 14:25:36 +02:00
Casey
865355b31c
Map
...
rebase to master
2023-06-27 14:20:00 +02:00
Raeschen
06ac845824
Merge pull request #6467 from CHOMPStation2/upstream-merge-15087
...
[MIRROR] Remove access from tavern
2023-06-27 14:15:06 +02:00
Casey
4e24a596f2
Remove access from tavern
...
rebase to master
2023-06-27 14:06:35 +02:00
Raeschen
1a9f8d33e2
Merge pull request #6464 from CHOMPStation2/upstream-merge-15084
...
[MIRROR] Little redgate update
2023-06-27 14:04:24 +02:00
Raeschen
f59af81ae0
Merge pull request #6468 from SlaysInCode/Get-out-of-Brig-free-card-removal
...
Get out of Brig free card Removal
2023-06-27 14:03:45 +02:00
Raeschen
216e9aef65
Merge pull request #6465 from CHOMPStation2/upstream-merge-15085
...
[MIRROR] Brings classic hard hats as alternate option
2023-06-27 14:01:53 +02:00
Casey
996f8483cc
Little redgate update
...
rebase to master
2023-06-27 13:59:57 +02:00
Raeschen
a96971e27f
Merge pull request #6463 from CHOMPStation2/upstream-merge-15083
...
[MIRROR] Adds admin logging to morph and maintpred ghost pods
2023-06-27 13:55:19 +02:00
Raeschen
5fa973378f
Merge pull request #6460 from CHOMPStation2/upstream-merge-15080
...
[MIRROR] HOTFIX: Climbing fixes
2023-06-27 13:54:10 +02:00
Raeschen
eac8c86ee8
Merge pull request #6459 from FluffMedic/Phazon
...
Two New POis, one kind of expiremental
2023-06-27 13:53:26 +02:00
Raeschen
8d15b13e7e
Merge pull request #6458 from CHOMPStation2/upstream-merge-15079
...
[MIRROR] Fixes Nikki's fluff outfit uniform not rendering onmob sprites
2023-06-27 13:52:48 +02:00
Raeschen
fd6cca4889
Merge pull request #6457 from CHOMPStation2/upstream-merge-15076
...
[MIRROR] Ranch
2023-06-27 13:50:17 +02:00
Raeschen
0563e27be0
resync upstream maps for ease
...
not used, doesn't matter
2023-06-27 13:32:14 +02:00
SlaysInCode
aa97b0a482
Get out of Brig free card Removal
...
A PR I should have putt through when disposal damage was first removed/nerfed.
- Removes the disposals bin in the Brig, replacing it with a basic large bin instead. Thus preventing mechanic abuse.
2023-06-27 07:10:38 -04:00
CHOMPStation2
37f9d5289c
Brings classic hard hats as alternate option
2023-06-26 20:20:27 +00:00
Heroman3003
7162053d20
Merge pull request #15085 from Heroman3003/classic-hardhat
...
Brings classic hard hats as alternate option
2023-06-26 20:20:27 +00:00
CHOMPStation2
b30f5ff8f7
Adds admin logging to morph and maintpred ghost pods
2023-06-26 19:43:20 +00:00
Casey
c8ab7b84d7
Merge pull request #15083 from Heroman3003/admin-log
...
Adds admin logging to morph and maintpred ghost pods
2023-06-26 19:43:20 +00:00
CHOMPStation2
af3693efd1
HOTFIX: Climbing fixes
2023-06-26 18:24:04 +00:00
Heroman3003
1e3eec5549
Merge pull request #15080 from Runa-Dacino/hotfixclimbing
...
HOTFIX: Climbing fixes
2023-06-26 18:24:04 +00:00
Fluff
26b39c9e7e
Two New POis, one kind of expiremental
...
Well technically four.
Bounty Hunter Zone - A holding site for bounty hunters while they await pick up.
Hadzard zone - Someone was holding out at a drop site, then after waiting a while, got frustrated and made it a hazard to be around.
The second one has no mobs, and is purely enviormental threats while you try to hook up an emitter.
2023-06-26 12:14:11 -04:00
CHOMPStation2
db92f3ac0f
Fixes Nikki's fluff outfit uniform not rendering onmob sprites
2023-06-26 10:40:16 +00:00
Heroman3003
457961f3ca
Merge pull request #15079 from Tenryumi/nikki-outfit-fix
...
Fixes Nikki's fluff outfit uniform not rendering onmob sprites
2023-06-26 10:40:16 +00:00
Casey
963d19aaf0
Ranch
2023-06-26 04:43:04 +00:00
Raeschen
49516b7467
Merge pull request #6455 from CHOMPStation2/Rae-missingsprites
...
Fixes several missing texture objects
2023-06-25 15:56:00 +02:00
Raeschen
e048b3a314
Fixes several missing texture objects
2023-06-25 15:38:45 +02:00
Raeschen
3f2a241ebe
Merge pull request #6448 from CHOMPStation2/upstream-merge-15060
...
[MIRROR] Time to get truly SWOL
2023-06-25 12:49:39 +02:00
Raeschen
69badd223e
Merge pull request #6454 from FluffMedic/Phazon
...
Adjusting some POI descriptions and the contents of one of my old POIs
2023-06-25 12:49:25 +02:00
