Killian
19c223c940
forgot a comma
2020-05-05 11:28:20 +01:00
Killian
6494e48c7a
small update to secpilot locker contents
2020-05-05 11:24:07 +01:00
Killian
c5e6fefcdd
Update access_datum_yw.dm
2020-05-04 14:28:46 +01:00
Killian
8240a97400
Merge branch 'master' into kk-miscstuff
2020-05-04 14:20:02 +01:00
Killian
163c856a0f
exploration zone/job fixes
2020-05-02 18:48:40 +01:00
SplinterGP
a655049350
adds YW edit
2020-04-30 20:08:25 -03:00
SplinterGP
78f4a2fd3f
Autolathe patch, fixes teleporter stuff making it buildable
2020-04-30 20:08:06 -03:00
spaghettiweaver
b5a2bfee1f
Moves the piano crate to largecrate_yw
...
modularity and all that
2020-04-24 22:45:54 -05:00
spaghettiweaver
aa87d150bd
Merge branch 'master' into pianocargo
2020-04-23 00:42:09 -05:00
spaghettiweaver
f87c9e7b7e
Adds purchaseable Piano crates to cargo
...
Costs 150 cargo points, to deliver a largecrate infamous for their ability to make their contents lighter and ship better. When pried open the crate produces either a minimoog or space piano.
2020-04-23 00:28:03 -05:00
Repede
11ed91d9bc
Merge branch 'master' into weh
2020-04-20 18:21:07 -04:00
Repede
b371d19100
makes hand plush do noise when poked too
2020-04-20 18:20:09 -04:00
Killian
04a0e66302
Merge branch 'master' into kk-miscstuff
2020-04-19 18:54:53 +01:00
Repede
abe9dfc323
Merge branch 'master' into kk-cyclers
2020-04-19 00:05:46 -04:00
Killian
ce261f6985
ssu sync & added cyclers
2020-04-18 03:08:35 +01:00
SplinterGP
1824f20ea4
reverts air alarm to old air alarm sprite
2020-04-17 18:56:38 -03:00
Killian
35dedb85e8
Merge branch 'master' into kk-miscstuff
2020-04-17 19:56:51 +01:00
Repede
e44e346352
Release Update
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
2020-04-16 21:07:33 -04:00
Aronai Sieyes
f92c2a2754
Merge pull request #7290 from VOREStation/aro-zfixes
...
Fix atmos alarm console and PDA power console zlevel confinement
2020-04-15 23:19:22 -04:00
Aronai Sieyes
cbe4c15bc2
Merge pull request #7288 from VOREStation/aro-randommechbug
...
Fix runtime in mechs taking damage
2020-04-15 23:19:09 -04:00
Aronai Sieyes
0bc5a35309
Fix atmos alarm console and PDA power console zlevel confinement
2020-04-15 22:03:39 -04:00
Aronai Sieyes
74a6c8cecb
Fix runtime in mechs taking damage
2020-04-15 21:49:05 -04:00
Aronai Sieyes
9167f86805
Confine timeclock announcements to specific levels
2020-04-15 21:42:35 -04:00
Aronai Sieyes
b87f94d6fc
Make starlight static
2020-04-15 19:02:21 -04:00
Aronai Sieyes
8512c48b3d
Swap overlay cache for appearance cache in SSskybox
2020-04-15 18:37:13 -04:00
Aronai Sieyes
13b5238ca0
Merge pull request #7273 from VOREStation/sscleanup/remove-processScheduler
...
Remove the processScheduler
2020-04-15 15:25:46 -04:00
Aronai Sieyes
027d153ea9
Add vorestation posters
2020-04-15 12:02:53 -04:00
Aronai Sieyes
a5379df00e
Let mechs connect to ports if they're larger mechs
2020-04-15 11:59:38 -04:00
Aronai Sieyes
0931f202ed
Merge pull request #7259 from VOREStation/vplk-sundry-fixes-xii
...
Fix Sundry Runtime Errors XII
2020-04-14 21:30:52 -04:00
Leshana
efb913ecb4
Fix Runtime in floor_attackby.dm,118: Cannot execute 0.is crowbar().
2020-04-14 17:03:21 -04:00
Leshana
879a9fe5b5
Fix Runtime in atoms_movable.dm,597: list index out of bounds
2020-04-14 17:03:09 -04:00
Leshana
3be0330db2
Remove the goonstation /datum/controller/processScheduler as it is no longer used.
2020-04-14 16:17:32 -04:00
Aronai Sieyes
01d6b87d69
Allow fighters to traverse overmap ships predictably
2020-04-14 15:56:40 -04:00
Aronai Sieyes
d21535a232
Merge pull request #7252 from VOREStation/aro-talontweaks2
...
More ship tweaks
2020-04-14 14:06:07 -04:00
Aronai Sieyes
20ed63594d
Update point defense sprites and power usage
2020-04-14 13:19:21 -04:00
Aronai Sieyes
857c0cfd6f
New 'emblem' flooring decals for ships/factions
2020-04-14 11:03:49 -04:00
Aronai Sieyes
da6c649e50
VS: Universal technomancer cores
2020-04-13 22:35:13 -04:00
Aronai Sieyes
4cfea4302d
Technomancer mark sprite
2020-04-13 22:35:13 -04:00
Aronai Sieyes
717acacba4
Beachyness
2020-04-13 17:36:15 -04:00
Aronai Sieyes
2e62158884
Make more turfs blend
2020-04-13 15:04:36 -04:00
Aronai Sieyes
e3a6def6f7
Remove cursed file
2020-04-13 11:18:39 -04:00
Aronai Sieyes
9368dd2736
Talon job pref saving
2020-04-13 11:05:27 -04:00
Aronai Sieyes
b1bf1a7e93
Merge pull request #7211 from VOREStation/vplk-shuttle-construction
...
Ship/Shuttle Console Construction
2020-04-13 10:01:56 -04:00
H0lySquirr3l
5bc18c4c96
Replace ring in holo boxing ring with actual ring. ( #7209 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Delete fitness_vr.dmi
* Add files via upload
2020-04-13 09:33:22 -04:00
Aronai Sieyes
d9b3739669
Merge branch 'master' into vplk-shuttle-construction
2020-04-13 09:30:05 -04:00
Aronai Sieyes
a7590e81a9
Merge pull request #7210 from VOREStation/aro-shuttleiocn
...
Changes shuttle landing soon warning
2020-04-13 09:28:53 -04:00
Aronai Sieyes
0d39c5535e
Merge pull request #7200 from VOREStation/aro-offmap-rebase2
...
ITV Talon offmap spawn jobs
2020-04-13 09:28:19 -04:00
Novacat
2c1030b3e6
Merge pull request #7224 from VOREStation/upstream-merge-6878
...
[MIRROR] A Tale of Blobs and Man
2020-04-13 08:14:41 -04:00
Atermonera
5308c2a6b3
Merge pull request #6989 from VOREStation/pol-blast
...
Random blast door fix
2020-04-13 02:22:26 -04:00
Atermonera
2374a40908
A Tale of Blobs and Man
2020-04-13 01:35:01 -04:00
