BlackMajor
6f9f78213d
Merge branch 'master' into matrices
2023-04-30 16:14:51 +12:00
BlackMajor
e3c6d74ffd
Done and dusted
2023-04-30 15:49:35 +12:00
Nadyr
fb6f726187
Merge pull request #6074 from Sharkmare/Flipper
...
Codename Flipper
2023-04-25 20:33:45 -04: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
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
45e1fbd0c5
Merge pull request #5924 from TheGreatKitsune/loadout-crystals
...
Adds loadout capture crystals!
2023-04-10 17:13:47 -04:00
Nadyr
622ab367a3
Merge pull request #6028 from TheGreatKitsune/Off-manifest-play
...
Buff Outsider positions, remove station autosleever ghost spawns
2023-04-06 18:34:14 -04:00
Verkister
b92fb9222a
Fixes a funny gargoyle feeding bug
...
Fixes borgo tongues giving feedable gargoyles a little bit too deep cleansing.
2023-04-03 15:31:54 +03:00
TheGreatKitsune
83dcbb29a8
Buff Outsider positions, remove station autosleever ghost spawns
2023-04-02 18:39:49 -05:00
Nadyr
dd5030f0dc
Merge pull request #6017 from Verkister/patch-39
...
Unhardens flush message code
2023-04-02 19:31:07 -04:00
Nadyr
04d3f4c669
Merge pull request #6012 from Verkister/stonebins
...
Feedable gargoyles
2023-04-02 19:29:42 -04:00
Verkister
1637bb6527
Unhardens flush message code
...
Makes it possible to varedit utilize a toilet into a non-toilet use without awkwardly revealing messages.
2023-04-02 16:15:55 +03:00
TheGreatKitsune
ec3cd00518
Merge master into shadekin-dark-tunneling
2023-04-01 09:24:41 -05:00
TheGreatKitsune
99d9295bc3
Merge master into loadout-crystals
2023-04-01 08:56:27 -05:00
Verkister
c15e184956
wrenk
2023-04-01 14:53:05 +03:00
Verkister
1af250adca
Feedable gargoyles
...
Petrified players can now be fed with grabbed or thrown mobs, and also thrown or held trasheatable items if their trash catching mode is enabled.
2023-04-01 14:15:08 +03:00
Seris02
6605d5a918
linters fix
2023-03-23 17:15:53 +08:00
Seris02
abc62d2d89
petrification interface
2023-03-23 16:43:42 +08:00
Nadyr
8a1c1b2243
Merge pull request #5967 from Seris02/gargoyleefficiency
...
better gargoyle code
2023-03-19 08:50:15 -04:00
Seris02
fb677ceee1
better gargoyle code
2023-03-18 19:56:35 +08:00
TheGreatKitsune
97701e8b3f
Adds loadout capture crystals!
2023-03-13 16:58:03 -05:00
LukasJuergens
a52ecf2637
New capture crystal type
...
Adds a new (cheap) capture crystal that only works on crew, not animals or carbon mobs with no client.
2023-03-13 22:07:59 +01:00
Sharkmare
5eec328c8c
Recolorable Petrification code
2023-03-08 22:04:47 +01:00
Sharkmare
4a2b06e0cf
Gargoyle Custimization round 1
...
"statue of name" now allows to change the statue part
"your skin hardens" now allows to change the hardens part
"you turn to stone" now allows to change the stone part
"your skin softens" modified to "your skin reverts" so we dont need a negative adjective
2023-03-08 17:38:36 +01:00
Kassc
52c445008c
Merge pull request #5798 from tacoguy7765093/krakatoa
...
Ports Lavaland tiles
2023-03-03 21:21:40 -05:00
BlackMajor
818f2d64e0
yeah
2023-03-02 20:41:12 +13:00
TheGreatKitsune
1d36a4215d
Item TF spawnpoints
2023-02-26 15:43:47 -06:00
Bib Bob
5c49d065a2
remove bad commented code
2023-02-26 00:39:22 -06:00
BlackMajor
7f52a2318b
Merge pull request #5727 from Seris02/radiohelping
...
stops radios from dropping out every second message
2023-02-23 14:42:15 +13:00
TheGreatKitsune
be82c20976
Add ability to block nonghost incorporeal movement
2023-02-21 04:16:13 -06:00
Seris02
a3c97cf926
makes a couple Entered() procs call parent as well - bellies + disposals
2023-02-18 11:47:27 +08:00
Seris02
d4cb44c6a6
better gargoyle
2023-02-16 20:01:37 +08:00
Seris02
f4d900475d
normal examine message
2023-02-16 15:05:33 +08:00
Seris02
2cbc17f720
Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into gargoyle
2023-02-16 12:16:57 +08:00
Seris02
5fe6b10dcd
GARGOYLES
2023-02-16 12:15:04 +08:00
Seris02
e2032cae20
back to other things for the moment
2023-02-15 12:07:50 +08:00
Bib Bob
d6305dafef
Walls fixed, random turfs, bleed through fixed
2023-02-13 23:08:36 -06:00
Bib Bob
9ec348a696
Merge remote-tracking branch 'origin/master' into krakatoa
2023-02-13 18:08:14 -06:00
Bib Bob
c0bbfc041b
saddsa
2023-02-13 18:08:07 -06:00
Bib Bob
7f532a0f80
the start
2023-02-13 17:49:59 -06:00
Nadyr
c2308a7693
Merge pull request #4811 from Kazzc/DesertTiles
...
Desert tiles, walls, cliffs, plants, mobs.
2023-02-13 18:43:45 -05:00
Razgriz
1d4a226770
Add files via upload
2023-01-19 14:00:46 -07:00
Nadyr
bf393f303c
no longer necessary due to upsream changes
2023-01-04 21:59:56 -05:00
Nadyr
9532bac6b9
Tweaks edge generation to work with upstream changes
2023-01-04 21:59:35 -05:00
Nadyr
f450beaf0d
Merge branch 'master' into DesertTiles
2023-01-04 21:57:16 -05:00
Verkister
0a7823f3b0
Merge branch 'master' into totallytubular
2022-12-26 21:26:16 +02:00
Verkister
4991545221
Makes mob ai neutral and adds cargo pack
2022-12-26 13:53:22 +02:00
BlackMajor
1e57ac0f60
Update loot_pile.dm
2022-12-24 14:17:14 +13:00
BlackMajor
362f539e12
Chrimbus Tree
2022-12-23 20:40:37 +13:00
Nadyr
9691157048
Merge branch 'master' into DesertTiles
2022-12-17 23:12:09 -05:00
