Raeschen
990b49d31b
Merge pull request #6534 from FoxglovePurpur/purdev-air_tanks
...
Air Tank Changes
2023-07-10 08:51:05 +02:00
Digi Purpur
869925562d
Thank you Bib <3
...
Bib brought up that the text shows
> That's Corrupted size gun.
when it should show
> That's a corrupted size gun.
So I fixed. :)
2023-07-08 21:17:25 -07:00
Purdev
dd355fea3d
Adds CHOMP Comments to tank_types.dm
...
Adds missing comments.
2023-07-08 11:59:13 -07:00
Digi Purpur
900b4995a3
Fixing tank_types.dm
...
This is mostly just in case tank_types_vr.dm missed something and in testing nothing went wrong with editing this to match the _vr version? Oh and also this DOES add unique sprites to certain things. So changing a couple small lines here n' there are important. (Basically sprite related changes here are required, volume and such idk)
2023-07-08 10:24:41 -07:00
Digi Purpur
81d43e20ef
Small Changes to Air Tanks
...
Changes the sprite for "double_nitrogen" from double phoron (why did it share the sprite?) to it's own sprite.
Makes double tanks properly doubled by ensuring they're *double* extended tanks. (normal emergency tanks have 2, extended have 6, double had 10, now 12.
2023-07-08 10:23:21 -07:00
Raeschen
143a5486fa
Update tile_types.dm
2023-07-07 09:53:38 +02:00
Raeschen
a7c603e2a6
Update window.dm
2023-07-07 09:51:15 +02:00
Raeschen
083cf18632
Update tile_types.dm
2023-07-07 09:49:15 +02:00
Heroman3003
e62d81af4b
[MIRROR] the little construction pr
2023-07-07 07:30:36 +00:00
Heroman3003
d2e70f0d95
Merge pull request #15115 from PastelPrinceDan/typofix
...
fixes a few typos
2023-07-06 21:52:26 +00:00
Raeschen
a77566d2fa
Merge pull request #6505 from CHOMPStation2/upstream-merge-15112
...
[MIRROR] Adds new Debris Field POI: Phoron Tanker!
2023-07-06 23:06:05 +02:00
Raeschen
87270d2f83
Update poi_items.dm
2023-07-06 22:49:28 +02:00
Razgriz
ffaaf30cdd
accurate comments that make you say yes
2023-07-06 03:09:54 -07:00
Razgriz
f589c2c704
comments that make you say yes
2023-07-06 03:09:27 -07:00
Razgriz
6e2958a855
fixes that make you say yes
2023-07-06 02:58:30 -07:00
Razgriz
294801f20b
powder that makes you say yes
2023-07-05 23:28:45 -07:00
Casey
568d1fed14
Adds new Debris Field POI: Phoron Tanker!
2023-07-05 22:28:58 +00:00
Casey
f62a1c4300
Health Analyzer post-guidance improvements
2023-07-05 22:26:47 +00:00
Raeschen
a670e75b5d
Merge branch 'master' into upstream-merge-15110
2023-07-05 12:43:07 +02:00
Raeschen
2f18685407
Merge pull request #6500 from CHOMPStation2/upstream-merge-15109
...
[MIRROR] Medical Guidance
2023-07-05 12:42:18 +02:00
Raeschen
952157d4a0
Update health.dm merge conflict
2023-07-05 12:34:48 +02:00
Raeschen
a21010de21
more missed names
2023-07-05 10:43:54 +02:00
Raeschen
23714a7b86
more chomp-specific name changes
2023-07-05 10:36:41 +02:00
Raeschen
2c9b7b1a59
mass renaming everything is a good thing right???
2023-07-05 10:33:37 +02:00
Raeschen
1e2deb86ed
missing comma
2023-07-05 10:21:45 +02:00
Raeschen
740a877f89
readd some chompedited stuff
2023-07-05 10:18:45 +02:00
Raeschen
0e680b38a5
missed conflict
2023-07-05 10:14:43 +02:00
Raeschen
3e0a0c0c98
big resync + merge conflicts
2023-07-05 10:12:39 +02:00
Heroman3003
f6fe96540e
Medical guide addition
2023-07-05 06:36:52 +00:00
Casey
e2fb4081d0
Medical Guidance
2023-07-04 23:21:27 +00:00
Casey
19550009ce
Tweaks and tidying
2023-07-03 10:24:10 +00:00
Heroman3003
9926ef6647
Merge pull request #15099 from Heroman3003/misc-fixes
...
A variety of miscellaneous bugfixes
2023-07-01 23:33:38 +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
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
Raeschen
e048b3a314
Fixes several missing texture objects
2023-06-25 15:38:45 +02:00
Raeschen
94c59cf604
Merge pull request #6446 from CHOMPStation2/upstream-merge-15070
...
[MIRROR] Adds some altevian-themed props
2023-06-25 12:40:00 +02:00
Aroliacue
9f44f1da93
Spiderweb/Cocoon Health Reduction
2023-06-24 17:02:44 +10:00
Heroman3003
9a2457d5aa
Adds some altevian-themed props
2023-06-23 18:44:40 +00:00
Heroman3003
252b82a34c
Merge pull request #15065 from Youtubeboy139/New-Decals
...
Gonna paint the floors red... with hazard lines
2023-06-22 18:07:52 +00:00
Raeschen
1189075bc3
fix merge conflicts
2023-06-22 10:45:56 +02:00
Heroman3003
29ca579ab8
Implements Climbing
2023-06-21 19:22:02 +00:00
Raeschen
ef98e7f4ea
Fix a few chomp-specific typepaths and a marge conflict
2023-06-21 08:26:10 +02: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
b3b2b9ce80
Merge pull request #6403 from CHOMPStation2/upstream-merge-15040
...
[MIRROR] New Belts and Accessories
2023-06-19 11:19:01 +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
db38ed93c0
Spell Fixes
2023-06-19 04:40:45 +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
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
