f3e3905b41
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-11 20:18:19 +01:00
ef78be37ce
space traffic updates
2024-12-08 08:00:55 +00:00
553675edf5
Merge branch 'master' into kk-spacetraffic
2024-12-06 20:45:06 +00:00
5092af9321
Merge pull request #16672 from Kashargul/areaStuff
...
converts area booleans to flags
2024-12-07 05:20:02 +10:00
9941ffa8dc
Merge branch 'master' into areaStuff
2024-12-07 05:14:52 +10:00
619364a073
Merge branch 'master' into headset
2024-12-07 05:13:21 +10:00
a827a8b5b2
Merge pull request #16667 from Kashargul/appearance
...
rework appearance changer
2024-12-07 05:07:30 +10:00
146c3f4140
Merge pull request #16659 from TheCaramelion/Viro-Update-1
...
Virology Update 1
2024-12-07 05:06:20 +10:00
edd99b63cf
Merge pull request #16639 from KillianKirilenko/kk-charpod
...
"Maint Lurker" Hole
2024-12-07 05:05:22 +10:00
9a940834b4
Enable creation of cycling airlocks
2024-12-04 13:45:19 -08:00
ead0180057
converts area vars to flags
2024-12-04 22:21:38 +01:00
68e5bf9d42
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:21:21 +01:00
02aea97e36
changes
2024-12-04 15:18:34 +01:00
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
01813cd4d0
maint lurker setup
2024-12-04 12:22:40 +00:00
001afdfbc5
Merge branch 'master' into kk-charpod
2024-12-04 09:25:02 +00:00
798589a4de
.
2024-12-03 11:21:55 +01:00
5febd2f97f
fix multiple headsets
2024-12-03 11:17:44 +01:00
90c2d09e8e
also fix that
2024-12-02 23:22:21 +01:00
e9aafd2826
Merge remote-tracking branch 'upstream/master' into kk-spacetraffic
2024-12-02 06:08:55 +00:00
9d3a7986d8
traffic update
...
more khi cleanup
2024-12-01 18:37:08 +00:00
a2ad915045
Device and weapon
2024-12-01 00:56:26 +01:00
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
a15578d8fd
Merge pull request #16597 from Kashargul/miscGripper
...
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
823db69af5
Merge branch 'master' into Viro-Update-1
2024-11-29 22:56:42 +01:00
8d675e86e7
Merge pull request #16616 from Kashargul/things
...
some accessories
2024-11-28 14:38:12 +10:00
938ab8af7c
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
2024-11-27 23:53:06 +01:00
c00e6f3d4d
Merge remote-tracking branch 'upstream/master' into kk-charpod
2024-11-27 20:37:02 +00:00
6f020343bb
Merge pull request #16650 from Heroman3003/thanksgivingturkey
...
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:53:12 +10:00
0b10e7770b
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:35:09 +10:00
fa5a178010
Merge pull request #16515 from ShadowLarkens/zas
...
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
8f061174aa
Merge pull request #16630 from Kashargul/clamps
...
surgery firstaid bags can carry bone clamps
2024-11-28 05:28:53 +10:00
e016744474
straggler pod: job/role finish
2024-11-27 12:12:03 +00:00
7af9d30e36
Few more stuff
2024-11-26 00:23:25 +01:00
58455f037c
Board
2024-11-25 18:26:55 +01:00
bc8d817ed3
surgery firstaid bags can carry bone clamps
2024-11-22 00:01:04 +01:00
61d13fd4ff
Spelling mistakes
2024-11-21 00:20:38 +01:00
a5e910bfd2
makes no more sense otherwise
2024-11-17 23:57:06 +01:00
8d24db7be4
Merge pull request #16512 from Darlantanis/OreGrinding
...
Ports grindable ores
2024-11-17 20:58:33 +10:00
edb46d85c2
Merge pull request #16589 from Kashargul/moduleSelectionUI
...
Moving robot module and icon selection to tgui
2024-11-17 20:54:08 +10:00
d1b6b8a6ca
adds petrification
2024-11-12 19:43:48 +01:00
49d89c0059
usr to user up to player effects
2024-11-12 00:10:20 +01:00
ba9b3e3676
include renaming
2024-11-11 08:53:52 +01:00
44f643b13d
Merge remote-tracking branch 'upstream/master' into kk-rings
2024-11-10 15:12:24 +00:00
6c8fa2dba1
maptest redgate ( #16579 )
...
* maptest redgate
* .
* .
* .
* .
* .
2024-11-09 15:42:44 +01:00
7117658a33
lockpicks ( #16580 )
2024-11-09 15:41:06 +01:00
8557359c75
refactors chameleon projector ( #16582 )
2024-11-09 15:38:16 +01:00
b7d77d7245
Hammers for hurting people ( #16569 )
...
* Hammers for hurting people
Added a new dark variant of the squish hammer that breaks every bone in the targets body and shoots out blood. Unfortunately they will become unsquished when they fall over, but still gets a nice initial squeeze!
Added a simple claw hammer weapon that I have plans for in an upcoming event. Strong melee weapon that easily breaks down windows and barricades, but also has a high chance of breaking any bones that it hits.
* Just a friendly little warning to my fellow staff :)
2024-11-09 15:36:15 +01:00
887700472d
Syndicate Headset Icons ( #16578 )
...
* Update headset.dm
* syndie headset fixes
* Update radio_vr.dmi
2024-11-09 02:00:52 +01:00
7175a48c8d
Virology Patch 1 ( #16581 )
...
* Update
* Small oopsies
2024-11-09 01:18:07 +01:00
izac112