Casey
897c1135fa
Merge pull request #13883 from Heroman3003/assorted-fix
...
Allows ID to be inserted into fax machine by clicking it + 2 minor fixes
2022-10-10 03:08:35 +00:00
Razgriz
0972599a01
Merge pull request #5094 from Verkister/patch-97
...
fixes solarmoth space runtime spam
2022-10-09 12:29:31 -07:00
Verkister
fd9e8654ec
fixes solarmoth space runtime spam
...
Im not even going to talk about the line right above this part...
2022-10-09 14:12:00 +03:00
Nadyr
a4c87ef001
Merge pull request #5039 from tacoguy7765093/petasucks
...
Ports the animal clinic from tgstation as a superimposed pod
2022-10-08 23:31:20 -04:00
Nadyr
8c907b1b5f
Merge pull request #5081 from crabcube/master
...
Tie new sprites to Vox suits
2022-10-08 23:30:24 -04:00
Nadyr
b0b43ffde6
Merge pull request #5093 from Verkister/patch-99
...
Lets non-crew show up in char directory
2022-10-08 23:24:27 -04:00
Nadyr
aa9b2efd47
Merge pull request #5092 from Verkister/patch-96
...
Lets capture crystal occupant see belly texts
2022-10-08 23:23:47 -04:00
Nadyr
22ef319243
Merge pull request #5090 from CHOMPStation2/upstream-merge-13879
...
[MIRROR] [MIRROR] Ports Aurora mining vendor as base for exploration vendor
2022-10-08 23:23:15 -04:00
Verkister
8ae208ce5e
fine dm didn't mind that but go off
2022-10-08 18:40:09 +03:00
Razgriz
ced01375b2
Merge pull request #5091 from CHOMPStation2/BlackMajor-patch-2
...
Tiny Incorporeal fix
2022-10-08 07:21:53 -07:00
Verkister
49bc0134ae
Lets non-crew show up in char directory
...
Humanmobs without crew record will however show up as "unknown" in the directory. However, with this addition, any antag who wants to stay completely sneaky will need to toggle their directory visibility manually, which should probably be added to event guidelines.
2022-10-08 14:41:47 +03:00
Verkister
3ef9f48a15
Lets capture crystal occupant see belly texts
...
Capture crystal occupants can now see the belly desc printed in chat whenever the crystal enters a vorgan.
2022-10-08 14:23:06 +03:00
BlackMajor
f8162b416d
Update mob.dm
2022-10-08 14:31:09 +13:00
BlackMajor
d37190a969
Update mob.dm
2022-10-08 14:27:58 +13:00
CHOMPStation2
b21830bf29
[MIRROR] Ports Aurora mining vendor as base for exploration vendor
2022-10-08 01:20:48 +00:00
C.L
3c7603b87b
Merge pull request #13879 from VOREStation/upstream-merge-8716
...
[MIRROR] Ports Aurora mining vendor as base for exploration vendor
2022-10-08 01:20:47 +00:00
Nadyr
bf38912a3b
Merge pull request #5088 from tacoguy7765093/tags-disposal
...
tags:disposal
2022-10-06 18:56:43 -04:00
Nadyr
ea5d307a5c
Merge pull request #5089 from Verkister/patch-95
...
Fixes that goddamn lighting.dm 36 spam
2022-10-06 18:56:06 -04:00
Verkister
180bd1ac9b
Fixes that goddamn lighting.dm 36 spam
...
suuhhneetyy cheeekkssss
2022-10-06 21:06:44 +03:00
Bib Bob
52cae31b77
fixes cafe disposal pipe
2022-10-06 10:52:03 -05:00
Nadyr
46f2fa221e
Merge pull request #5087 from Verkister/patch-94
...
Earlyport harvest color fix
2022-10-05 18:13:22 -04:00
Nadyr
ee8e5a3779
Merge pull request #5085 from TheGreatKitsune/vore-sprite-color
...
Add vore sprite coloring.
2022-10-05 18:11:05 -04:00
Nadyr
5ad81a62e5
Merge pull request #5084 from Cameron653/Section-3-Parachute
...
bugtest your stuff lol
2022-10-05 18:09:55 -04:00
Verkister
0822ccfc55
Earlyport harvest color fix
...
Fixes harvested produce getting the produce color (meant for the produce part of the icon overlay and not the leaf part, which uses its own color) applied on top of both already colored overlays for a second time, most visible on mushrooms, which have ended up with hypersaturated caps and incorrect underside colors.
2022-10-05 14:05:53 +03:00
TheGreatKitsune
1d8bc1b862
Add vore sprite coloring.
2022-10-04 18:07:56 -05:00
C.L
70d12b326b
bugtest your stuff lol
...
shame bell
2022-10-04 18:30:20 -04:00
crabcube
0beb9d1648
Tie new sprites to Vox suits
...
Wip for now as i make sure it works
2022-10-03 20:32:44 -05:00
Razgriz
85953c79c2
Merge pull request #5077 from TheGreatKitsune/Borg-lab-revert
...
Revert the borglab change
2022-10-03 00:42:46 -07:00
Razgriz
3c9136a1a2
Merge pull request #5079 from CHOMPStation2/Razgriz1032-patch-22
...
Move inclusion of southerncross turfs.dm to vorestation
2022-10-03 00:29:03 -07:00
Razgriz
a1a21b9297
Comment out turfs/outdoors.dm because it is now included in the .dme
2022-10-03 00:04:14 -07:00
Razgriz
781198e95d
SC turfs needs to be included in the dme in order for CI to not panic
2022-10-03 00:02:34 -07:00
Razgriz
bc11a71651
Merge pull request #5065 from CHOMPStation2/upstream-merge-13825
...
[MIRROR] Sanitization
2022-10-02 23:01:42 -07:00
Razgriz
d7a36a1961
Merge pull request #5074 from CHOMPStation2/Razgriz1032-patch-20
...
Remove self-insert
2022-10-02 22:48:17 -07:00
Razgriz
cd0e5fd00a
Merge pull request #5068 from CHOMPStation2/upstream-merge-13828
...
[MIRROR] Blueprint Revamp.
2022-10-02 22:47:55 -07:00
TheGreatKitsune
253b65ddfa
Revert the borglab change
2022-10-03 00:35:09 -05:00
Razgriz
e4123b28ba
Update buildmode.dm
2022-10-02 22:28:38 -07:00
Razgriz
8f46e54856
idk what is wrong with these
2022-10-02 22:27:41 -07:00
Razgriz
d0185f2ce3
Merge pull request #5067 from CHOMPStation2/upstream-merge-13823
...
[MIRROR] Adds in 'compliance implant'
2022-10-02 22:24:18 -07:00
Razgriz
461c45b69b
powder that makes you say yes
2022-10-02 22:23:09 -07:00
Razgriz
1f745f7af4
🧠
2022-10-02 22:12:03 -07:00
Razgriz
1ff04585a1
Merge pull request #5073 from AdmiralDragon/master
...
Vox orderable rigsuit sprites
2022-10-02 22:09:38 -07:00
Razgriz
16a99cc0cf
Merge pull request #5072 from CHOMPStation2/upstream-merge-13832
...
[MIRROR] Fixes rapid pipe dispenser UI to display names
2022-10-02 22:09:14 -07:00
Razgriz
c647645e4c
Merge pull request #5070 from CHOMPStation2/upstream-merge-13831
...
[MIRROR] [MIRROR] moved sdmm defines to as early as possible in env [ABLE TO BE MERGED]
2022-10-02 22:09:00 -07:00
Razgriz
07e6fd2583
Merge pull request #5069 from CHOMPStation2/upstream-merge-13827
...
[MIRROR] Mining bugfix
2022-10-02 22:08:38 -07:00
Razgriz
c13b8117e1
more comments
2022-10-02 22:08:06 -07:00
Razgriz
8e872b9c9b
comments
2022-10-02 22:06:52 -07:00
Razgriz
df46985d2e
powder that makes you say yes
2022-10-02 22:05:32 -07:00
Razgriz
6c1509c0ad
powder that makes you say yes
2022-10-02 22:03:08 -07:00
Razgriz
6a40e6518d
Merge branch 'master' into upstream-merge-13825
2022-10-02 22:00:46 -07:00
Razgriz
9a1ec7367b
Merge pull request #5062 from CHOMPStation2/upstream-merge-13822
...
[MIRROR] Ghost default swap
2022-10-02 21:58:56 -07:00
