Commit Graph

74990 Commits

Author SHA1 Message Date
Raeschen
ca19ab2abd Fix a merge conflict 2023-06-13 22:46:01 +02:00
Kassc
426f253fae Merge pull request #6237 from FluffMedic/AlienCritterRebranding
Alien critter rebranding
2023-06-12 12:14:40 -04:00
Nadyr
1bf74c1315 Merge pull request #6326 from CHOMPStation2/upstream-merge-14974
[MIRROR] adds hand-holes to the skyrat/tg ported uniforms
2023-06-09 22:39:48 -04:00
Nadyr
22fb52f856 Merge pull request #6308 from CHOMPStation2/upstream-merge-14950
[MIRROR] Adds artists/genres to entries missing them in jukebox
2023-06-09 22:33:45 -04:00
Nadyr
443303d900 Merge pull request #6335 from ItsSelis/selis-lighting
Lighting subsystem update
2023-06-09 22:32:19 -04:00
Nadyr
b6fffdf176 Merge pull request #6318 from Seris02/corpsesensors
stops vox npcs from showing up on sensors
2023-06-09 22:31:00 -04:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936
[MIRROR] Little Weakref Refactor
2023-06-09 22:27:56 -04:00
Nadyr
87a6616138 Merge pull request #6313 from CHOMPStation2/upstream-merge-14948
[MIRROR] New Prosthetic Fab (Brain hurty, no funny name)
2023-06-09 22:25:44 -04:00
Nadyr
8280d28d5f Merge pull request #6311 from CHOMPStation2/upstream-merge-14821
[MIRROR] 2023 EnerGen Power Cells
2023-06-09 22:23:14 -04:00
Nadyr
e4831adcad Merge pull request #6310 from CHOMPStation2/upstream-merge-14951
[MIRROR] Fixes mapgen errors from POI corpses by re-ticking corpse.dm
2023-06-09 22:21:43 -04:00
Nadyr
d83d7fcd3c Merge pull request #6306 from CHOMPStation2/upstream-merge-14954
[MIRROR] Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
2023-06-09 22:19:01 -04:00
Nadyr
a1de745fca powder that makes you say yes 2023-06-09 22:12:46 -04:00
Nadyr
14946b1aca powder that makes you say yes 2023-06-09 22:10:20 -04:00
Nadyr
002a1e1ce3 Merge pull request #6301 from CHOMPStation2/upstream-merge-14946
[MIRROR] Changes bloodsucker subtle mode to use italics rather than bold
2023-06-09 22:05:10 -04:00
Nadyr
89feb48c81 powder that makes you say yes 2023-06-09 22:02:41 -04:00
Nadyr
ea3c4ec289 Merge pull request #6299 from CHOMPStation2/upstream-merge-14942
[MIRROR] Zera's Purple Cloak
2023-06-09 21:58:40 -04:00
Nadyr
25e871ad78 powder that makes you say yes 2023-06-09 21:57:47 -04:00
Nadyr
4b77ac894e powder that makes you say yes 2023-06-09 21:55:09 -04:00
Nadyr
40fb57dab4 Merge pull request #6298 from CHOMPStation2/upstream-merge-14940
[MIRROR] Hell of a Crate time!
2023-06-09 21:52:22 -04:00
Nadyr
e6c29b72a5 Merge pull request #6303 from CHOMPStation2/upstream-merge-14935
[MIRROR] Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
2023-06-09 21:50:24 -04:00
Nadyr
812e3b85ab Merge pull request #6300 from CHOMPStation2/upstream-merge-14943
[MIRROR] Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
2023-06-09 21:47:14 -04:00
Nadyr
cd32adc93a Merge pull request #6297 from CHOMPStation2/upstream-merge-14938
[MIRROR] Variety Add-on
2023-06-09 21:46:13 -04:00
Nadyr
088d87cb57 Merge pull request #6293 from CHOMPStation2/upstream-merge-14931
[MIRROR] Items for the Plant People (not the literal plant people)
2023-06-09 21:45:16 -04:00
Nadyr
27fad38be0 powder that makes you say yes 2023-06-09 21:44:45 -04:00
Nadyr
811dcb945f powder that makes you say yes 2023-06-09 21:43:29 -04:00
Nadyr
234de98640 powder that makes you say yes 2023-06-09 21:41:10 -04:00
Nadyr
8fd186a21a powder that makes you say yes 2023-06-09 21:34:21 -04:00
Nadyr
5aa4bab24a Merge pull request #6296 from FluffMedic/Mistakes
Trying to make amends.
2023-06-09 21:32:50 -04:00
Nadyr
83242d1b76 Merge pull request #6294 from CHOMPStation2/upstream-merge-14932
[MIRROR] New Inflatable Sprites (Not that type of inflation. Or economic inflation.)
2023-06-09 21:30:53 -04:00
Nadyr
14d919f6ce powder that makes you say yes 2023-06-09 21:29:08 -04:00
Nadyr
8ab286b258 Merge pull request #6290 from CHOMPStation2/upstream-merge-14925
[MIRROR] mecha medigun required_type fix
2023-06-09 21:28:14 -04:00
Nadyr
1b6e976858 Merge pull request #6292 from CHOMPStation2/nanomaps_generation
Automatic NanoMap Update
2023-06-09 21:27:27 -04:00
Nadyr
a06f376833 Merge pull request #6289 from CHOMPStation2/upstream-merge-14928
[MIRROR] The Suits of the Void
2023-06-09 21:26:44 -04:00
Nadyr
d987605022 Merge pull request #6288 from CHOMPStation2/upstream-merge-14916
[MIRROR] Medical Mayhem
2023-06-09 21:26:00 -04:00
Nadyr
35b9e6ecb5 Merge pull request #6287 from CHOMPStation2/upstream-merge-14914
[MIRROR] Changes The Boozemat (It's 5:45am - I can't think of any good jokes)
2023-06-09 21:24:52 -04:00
Nadyr
e512fe3854 Merge pull request #6286 from CHOMPStation2/upstream-merge-14920
[MIRROR] "You're late, go clock in..."
2023-06-09 21:23:23 -04:00
Nadyr
fddcbf1fcc Merge pull request #6285 from CHOMPStation2/upstream-merge-14912
[MIRROR] It's all bout that Money Money Money
2023-06-09 21:21:13 -04:00
Nadyr
c9055c240b Merge pull request #6282 from FluffMedic/Xenoarch
Fixing a typo
2023-06-09 21:20:05 -04:00
Nadyr
6463248ed5 Merge pull request #6284 from CHOMPStation2/upstream-merge-14930
[MIRROR] Buffs harm-injection
2023-06-09 21:18:32 -04:00
ItsSelis
d0fdd9c6be Lighting subsystem update 2023-06-07 17:40:59 +02:00
CHOMPStation2
becc34d20e adds hand-holes to the skyrat/tg ported uniforms 2023-06-05 19:59:05 +00:00
Heroman3003
28a2747653 Merge pull request #14974 from peeesh/catch-these-hands-bro
adds hand-holes to the skyrat/tg ported uniforms
2023-06-05 19:59:05 +00:00
Kassc
3129a35fe2 Merge pull request #6324 from Kazzc/Examplemaps
ExampleMaps-1.1
2023-06-04 23:08:59 -04:00
NanoMap Generation
82d716a3ed NanoMap Auto-Update (Sun Jun 4 23:29:29 UTC 2023) 2023-06-04 23:29:30 +00:00
Razgriz
1a5d27a80b Merge pull request #6321 from FluffMedic/Cultist
Fixing an area/space
2023-06-04 16:26:58 -07:00
Fluff
ceb99b32e7 Also fixes a mistake
The mining satchel of holding was meant to be a pouch of holding.
2023-06-04 19:26:05 -04:00
Fluff
0ef7dec557 Fixing an area/space
Title
2023-06-04 18:43:32 -04:00
Kassc
221eebc2df Merge pull request #6295 from FluffMedic/Cultist
Alt Version Of Deep Wilds POIs
2023-06-04 14:29:10 -04:00
Kassc
271c76a9c8 Merge pull request #6234 from Darlantanis/VRunjank
VR tweaks and mob transformation
2023-06-04 14:26:38 -04:00
Seris02
6c5a4fe2d2 stops vox npcs from showing up on sensors 2023-06-04 20:11:18 +08:00