Commit Graph

31034 Commits

Author SHA1 Message Date
Casey
45ce22c98e Merge pull request #14700 from Heroman3003/weather-fixes-changes
Various weather and firework related cleanup and adjustments
2023-03-18 16:55:40 -04:00
Casey
1bad31fe38 Merge pull request #14676 from Very-Soft/squirrel
Mob tweaks and fixes
2023-03-18 16:55:27 -04:00
VerySoft
23a3fccaa7 fimx 2023-03-18 16:12:28 -04:00
VerySoft
e47842007d Scary sounds are scary
SCARY!!!!
2023-03-18 15:47:29 -04:00
Heroman3003
00dac3b669 Fixes recipe id 2023-03-17 07:58:10 +10:00
Heroman3003
d88c8acc4d Fixes sort strings 2023-03-16 17:45:13 +10:00
Heroman
f8f34e0d10 Removes stray line 2023-03-16 17:21:20 +10:00
Heroman
fbf6bf41c2 Various weather and firework related cleanup and adjustments 2023-03-16 17:07:56 +10:00
Heroman3003
4994a56160 Merge pull request #14517 from VOREStation/upstream-merge-8940
[MIRROR] Adds fog as a weather. It's cold.
2023-03-16 15:51:40 +10:00
Heroman3003
1485ac4ca7 Merge pull request #14601 from VOREStation/upstream-merge-8955
[MIRROR] AI can change their hologram color.
2023-03-15 07:52:30 +10:00
Heroman3003
97887b7789 Update ai.dm 2023-03-15 07:44:07 +10:00
Heroman3003
488b88445f Update ai.dm 2023-03-15 07:41:37 +10:00
Heroman3003
f0ba616698 Update ai.dm 2023-03-15 07:38:53 +10:00
Heroman3003
43d020a1f7 Merge pull request #14682 from VOREStation/upstream-merge-9028
[MIRROR] Finally allows RPD to be used.
2023-03-15 07:33:31 +10:00
Heroman3003
017f4cdc44 Update station.dm 2023-03-15 07:23:44 +10:00
Heroman3003
f5dc7fe8d0 Update station.dm 2023-03-15 07:22:54 +10:00
Heroman3003
3360ea045c Merge pull request #14696 from Heroman3003/slowdown-stuff
Fixes some minor issues with water/snow slowdown
2023-03-15 07:19:30 +10:00
Heroman3003
d35edf08c9 Merge pull request #14661 from KillianKirilenko/kk-mini3
Changelog Reroute
2023-03-15 07:19:15 +10:00
Heroman3003
f11f77702c Update sif.dm 2023-03-15 07:17:30 +10:00
Heroman3003
0be53d50f6 Merge pull request #14618 from MisterGrimm/GA-X
Adds a new mech weapon, the GA-X Experimental Gamma Laser
2023-03-15 07:14:02 +10:00
Heroman
eb83a77a44 Fixes some minor issues with water/snow slowdown 2023-03-15 07:07:05 +10:00
Heroman3003
ec61e89345 Merge pull request #14616 from Runa-Dacino/OMNameLandmarkTry2
Creates framework for renaming visitable overmap objs on initialization
2023-03-15 04:50:00 +10:00
Killian
66b57eaf7f Update miscellaneous.dm 2023-03-14 18:22:19 +00:00
Heroman3003
4efbfe4fcb Merge pull request #14662 from KillianKirilenko/kk-wepdesc
Weapon Info on Examine
2023-03-15 04:08:50 +10:00
Runa Dacino
f420d5910f Merge branch 'master' into OMNameLandmarkTry2 2023-03-14 19:08:35 +01:00
Heroman3003
5fbbd9791e Merge pull request #14683 from VOREStation/upstream-merge-9030
[MIRROR] Fixes a small hiccup in cable coil examine text
2023-03-14 18:16:21 +10:00
Heroman3003
a4789c5723 Merge pull request #14689 from VOREStation/upstream-merge-9039
[MIRROR] Siege Hivebots Use Proper Projectile
2023-03-14 18:16:05 +10:00
Heroman3003
9266d57e22 Merge pull request #14686 from VOREStation/upstream-merge-9033
[MIRROR] *bing
2023-03-14 18:13:22 +10:00
Heroman3003
1471721003 Update ranged_damage.dm 2023-03-14 18:08:41 +10:00
Heroman3003
8fa3852d5e Update ranged_damage.dm 2023-03-14 18:05:10 +10:00
Heroman3003
d59b9ac766 Update emote.dm 2023-03-14 18:03:59 +10:00
Heroman3003
0bde5eea0b Update emote.dm 2023-03-14 18:03:48 +10:00
Heroman3003
cfb42c8817 Update emote.dm 2023-03-14 18:00:37 +10:00
Heroman3003
c2a88ee632 Update emote.dm 2023-03-14 18:00:22 +10:00
Heroman3003
bdee40eb80 Update engineering.dm 2023-03-14 17:58:10 +10:00
Atermonera
c0b10f2405 Siege Hivebots Use Proper Projectile 2023-03-14 03:54:15 -04:00
Atermonera
3ad7cd8e8e *bing 2023-03-14 03:50:45 -04:00
Atermonera
def3b6c762 Merge pull request #9030 from Ilysen/if-i-dont-do-a-small-thing-here-and-there-im-gonna-melt
Fixes a small hiccup in cable coil examine text
2023-03-14 03:46:15 -04:00
Mechoid
4efd54d7ae Finally allows RPD to be used. 2023-03-14 03:45:06 -04:00
Atermonera
f7669b64d0 Sheet storage has different caps per type. 2023-03-14 03:44:57 -04:00
VerySoft
a9bd3f7111 morphs too 2023-03-13 15:46:12 -04:00
VerySoft
ef269b3186 Mob tweaks and fixes
The mob cooldown thing from upstream made everything with a positive number in the variable be ultra slow. I'm not sure how it was that the variable was broken previously considering that the higher the number was the slower things went, but now it's ultra slow or nothing! cringe.

Adjusts some of the mobs I've made that are supposed to not be slow to still not be slow, as well as touches up a couple of things with squirrels
2023-03-13 14:37:22 -04:00
Killian
c7b0ce3496 Update guns.dm
this is totally cheating but fuck it
2023-03-13 18:33:36 +00:00
Heroman3003
48aca7185c Merge pull request #14675 from Heroman3003/boot-no-kill
Removes warcrimes from boots
2023-03-13 15:25:27 +10:00
Heroman3003
21acee71bf Merge pull request #14551 from VOREStation/upstream-merge-8962
[MIRROR] /tg/ era language pass
2023-03-13 15:23:34 +10:00
Heroman3003
7547f7c3ce Update snacks.dm 2023-03-13 15:16:45 +10:00
Heroman3003
043b99717f Update food_drinks.dm 2023-03-13 15:12:15 +10:00
Heroman3003
6aecbcd4c2 Update reagent_tank.dm 2023-03-13 15:11:06 +10:00
Heroman3003
37fe448b52 Update snacks.dm 2023-03-13 15:10:05 +10:00
Heroman3003
9e4d056d72 Update vending_machines.dm 2023-03-13 15:08:32 +10:00