Commit Graph

23992 Commits

Author SHA1 Message Date
variableundefined
df778ab8fb Merge pull request #16621 from Qwertytoforty/anomalys-of-highest-quality
Makes anomalies able to spawn in more areas
2021-09-06 21:40:16 -05:00
variableundefined
cf5544846b Merge pull request #16613 from Qwertytoforty/transforming-views
Removes transformation sting
2021-09-06 21:40:06 -05:00
variableundefined
842f8267b2 Merge pull request #16510 from theo-3/bee_hitbox
Make bee hitbox much smaller, except if the bee attacks someone
2021-09-06 19:12:20 -05:00
variableundefined
2354619f17 Merge pull request #16525 from S34NW/glass_floors_2
Glass floors attempt 2
2021-09-06 19:10:44 -05:00
LightFire53
2531a8ce89 Black magicks
Told by S34N that this will fix an issue with solar control consoles being bugged visually
2021-09-06 16:46:07 -07:00
Sirryan2002
b98cc81a3a Updates Sandwiches 2021-09-06 17:32:49 -04:00
variableundefined
85c8e96db9 Merge pull request #16626 from AffectedArc07/removes-warning-system
Removes bay-era warning system
2021-09-06 14:30:40 -05:00
Qwertytoforty
c4a0cb9776 Puts MSAY in OOC logging view 2021-09-06 14:45:34 -04:00
E-MonaRhg
23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
E-MonaRhg
a99fc879df Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-06 19:32:39 +02:00
SteelSlayer
3cc83e6011 wand of slipping fixes 2021-09-06 12:23:27 -05:00
Fox McCloud
23164e354b conflicts 2021-09-06 04:06:47 -04:00
variableundefined
dd17035c1f Merge pull request #16567 from SabreML/fluorescent-lights
Adds a short warm-up time when turning on a light
2021-09-05 16:05:21 -05:00
variableundefined
58af5b79a5 Merge pull request #16564 from S34NW/tg_machinery_port
TG sprite project: Vendors and Consoles.
2021-09-05 16:04:10 -05:00
Sirryan2002
2d3f02e795 Changes Gimlet Recipe + Result Amount 2021-09-04 16:06:34 -04:00
sldomino
d6222c090d changes double qoutes to single qoutes 2021-09-03 22:23:26 -04:00
sldomino
d472c4d668 fixes claw game arcade 2021-09-03 20:03:23 -04:00
SteelSlayer
dec01b62e3 robot move refactor 2021-09-03 08:47:30 -05:00
SabreML
b2ab2cfbd8 Fix 2021-09-03 14:24:56 +01:00
AffectedArc07
633a8bcfa5 Removes bay-era warning system 2021-09-03 13:16:49 +01:00
deelite34
eefe5661e4 remove redundant hand-holding explanation of reflection sentence 2021-09-02 22:48:13 +02:00
SabreML
e9f807fa3b More reviews
The bat faction needs to use \ref, since the faction check system uses that too.
2021-09-02 21:05:18 +01:00
Fox McCloud
8fceeb0faa tweak 2021-09-02 14:28:35 -04:00
Fox McCloud
0af3fc340c Spin Emote Changes 2021-09-02 14:17:21 -04:00
Luc
db067fabeb Ensures rev heads are shown in ahud orbit menu (#16624)
Co-authored-by: chafla <namen937@gmail.com>
2021-09-02 18:55:38 +01:00
SabreML
c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
Qwertytoforty
2cd9063e70 Allows status to output the round ID (#16610)
* Allows status to output the round ID

* Spacing is good for clarity
2021-09-02 14:34:47 +01:00
AffectedArc07
70fd70f2eb Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-02 14:01:27 +01:00
variableundefined
2225fff357 Merge pull request #16574 from S34NW/brain_damage_avoidance_fix
Fixes bug with species organ list
2021-09-01 20:02:22 -05:00
variableundefined
50ec519bcd Merge pull request #16320 from thatdanguy23/newdrinks
six new drinks
2021-09-01 19:49:20 -05:00
variableundefined
12b6c6973f Merge pull request #16506 from SabreML/dragging-tweaks
Fixes 'Face while pulling' oversights
2021-09-01 19:47:29 -05:00
variableundefined
936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
2021-09-01 19:46:04 -05:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
variableundefined
abe072f936 Merge pull request #16596 from S34NW/right-click-rearrange
Makes admin verbs easier to see on the context menu
2021-09-01 19:43:56 -05:00
variableundefined
5875fd703a Merge pull request #16600 from PacifistDalek/dutch-food
Adds Stroopwafels
2021-09-01 19:42:17 -05:00
Qwertytoforty
34bf1a5fe8 Removes notranssting flag 2021-09-01 13:27:28 -04:00
Qwertytoforty
76a0a03f15 Update code/modules/events/anomaly.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-09-01 12:49:13 -04:00
Qwertytoforty
e05c7151af Makes anomalies able to spawn in more areas 2021-08-31 19:01:20 -04:00
SteelSlayer
a3c6beb28b runechat_msg_location UID (#16444) 2021-08-31 13:28:22 +01:00
dearmochi
9d9c592de7 Possibly fix being unable to call extraction (#16586) 2021-08-31 12:37:04 +01:00
PacifistDalek
aadcddefd1 Merge remote-tracking branch 'upstream/master' into dutch-food 2021-08-30 12:42:42 -04:00
michaelyesok
9a7aadd3a0 Merge branch 'master' into foampistol 2021-08-30 00:18:12 +02:00
PacifistDalek
31c2c5a682 Lowered junkiness 2021-08-29 18:09:29 -04:00
AffectedArc07
4062bc6b1a Merge branch 'master' into client-data-loading 2021-08-29 20:56:41 +01:00
variableundefined
e4355d7d63 Merge pull request #16529 from chafla/foam-fixes
Ensure only pistol-type weapons can be holstered
2021-08-29 14:47:09 -05:00
variableundefined
57dce623ec Merge pull request #16539 from AffectedArc07/queue-prep
Replaces panic bunker with queue server
2021-08-29 14:46:27 -05:00
S34NW
e65b17d96e Merge remote-tracking branch 'upstream/master' into tg_machinery_port 2021-08-29 20:46:11 +01:00
variableundefined
bdadf23b34 Merge pull request #16593 from PacifistDalek/i-like-bread
TG bread sprites
2021-08-29 14:43:32 -05:00
variableundefined
7964ea23ca Merge pull request #16569 from S34NW/tg_object_sprites
[REQUIRES #16571] TG sprite project: item/obj (part 1)
2021-08-29 14:42:18 -05:00
SabreML
0a4b398b06 Review 2-3 2021-08-29 00:59:39 +01:00