ItsSelis 7e75bf19a6 Resolve conflicts

2022-07-03 16:18:28 +02:00

..

devices

Reply if self sent the message

2022-07-03 16:02:41 +02:00

robot

Makes robot emergency restart re-add robot verb

2022-07-01 15:41:10 +10:00

stacks

Merge pull request #13114 from Heroman3003/happycarpet

2022-06-18 23:58:23 -04:00

toys

More Input Conversion

2022-06-19 12:21:51 +02:00

weapons

Makes seismic charges not work on admin z-levels

2022-07-03 05:24:44 +10:00

antag_spawners.dm

…

apc_frame.dm

Fixes some janky frame issues

2021-11-22 06:52:33 +10:00

bells.dm

Merge pull request #8252 from lbnesquik/Kot-material-costs

2021-09-02 22:20:16 -04:00

blueprints.dm

More Input Conversion

2022-06-19 12:21:51 +02:00

bodybag.dm

Input Conversion Part 2

2022-06-19 03:40:24 +02:00

contraband_vr.dm

…

contraband.dm

Base Commit

2022-04-17 13:15:30 -04:00

crayons.dm

…

falling_object_vr.dm

…

glassjar.dm

…

gunbox_vr.dm

Update gunbox_vr.dm

2022-07-03 05:11:49 +01:00

gunbox.dm

Base Commit

2022-03-24 16:35:34 -04:00

latexballoon.dm

…

magazine.dm

…

paintkit.dm

quake 3 arena was a good game

2022-02-03 02:44:55 -06:00

pizza_voucher_vr.dm

…

poi_items.dm

…

robobag.dm

…

selectable_item_vr.dm

Fixes selectable item dupe bug

2022-06-25 15:37:23 +10:00

shooting_range.dm

…

tailoring.dm

…

trash_material.dm

…

trash_vr.dm

…

trash.dm

Base Commit

2021-10-22 23:21:29 -04:00

uav.dm

More Input Conversion

2022-06-19 12:21:51 +02:00