Repede
7ff67d6909
Fixes typo
2020-02-22 12:44:30 -05:00
Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Arokha Sieyes
14942ee6c7
VS: Don't talk to strangers
2020-02-17 12:44:17 -05:00
Arokha Sieyes
3cbd51c6d1
Don't talk to strangers
2020-02-17 12:44:10 -05:00
Novacat and GitHub
106711b0f3
Merge pull request #6508 from VOREStation/Verkister-patch-7
...
A ban-flinging QoL update
2020-02-14 20:53:25 -05:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Verkister and GitHub
0afc30e8ac
Update functions.dm
2020-02-12 15:19:53 +02:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Verkister and GitHub
1392f268ec
A ban-flinging QoL update
...
Sabotages the exploitable ban-dodging mob-lock "feature" of the ban system. Like dude we're banning a client, not a mob so shut up and let us work.
2020-01-26 13:06:26 +02:00
Novacat and GitHub
9e0e860f4e
Merge pull request #6454 from VOREStation/discoban
...
Ban/unban, note/unnote, kick to webhook
2020-01-21 01:46:53 -05:00
Novacat and GitHub
aeee2fd56d
Update admin_secrets.dm
2020-01-21 01:10:34 -05:00
Atermonera and VirgoBot
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Aronai Sieyes
2b4064e5cf
IP reputation check toggle verb
2020-01-16 10:11:44 -05:00
Aronai Sieyes
fec8571d65
Ban/unban, note/unnote, kick to webhook
2020-01-15 21:26:56 -05:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Atermonera and VirgoBot
0924159554
Merge pull request #6589 from Heroman3003/fruist-multispawn
...
Allows admin spawning fruit in multiples
2019-12-31 19:14:32 -05:00
Unknown
63f2fc0f20
Repurposing FTW
2019-12-25 13:54:31 -05:00
Unknown
235308da6e
Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes
2019-12-22 13:40:04 -05:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Unknown
9a7ac20158
Removes extraneous edit
2019-12-21 12:06:42 -05:00
Unknown
2e599f02c0
Actually this is redundant
2019-12-21 11:38:14 -05:00
Unknown
c0c5a6915c
Derp
2019-12-21 11:37:28 -05:00
Unknown
283ac706b0
Mowmowmow
2019-12-21 11:30:34 -05:00
Unknown
40ade46d39
MSay/ASay perm changes
2019-12-21 10:44:53 -05:00
Spades and GitHub
ec6ecb13ae
Merge pull request #6303 from Novacat/nova-basicfixes
...
Minor bug fixes
2019-12-19 22:22:09 -05:00
Atermonera and VirgoBot
3b7a737c08
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
Unknown
2e584ce3d0
Minor bug fixes
...
- Ahelps sent by admins are no longer sent to discord
2019-12-13 19:50:36 -05:00
Unknown
f68a82b81f
Replaces lentext with length
2019-12-12 13:13:18 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Rykka
45abd9ae01
Testfix/reset filediff
2019-11-13 05:00:38 -07:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera and VirgoBot
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Verkister
e28722b64d
A bunch of little fixes and event features.
...
-Adds simplemob radio. A "headset" that can be used and listened on by simplemobs. Adminspawn the item, shove it into your mob's contents, and link a reference to the item into the mob's mob_radio var. Additional keys can be added same way as regular headsets before "implanting" into the mob.
-Adds leap/pounce verb for simplemobs. Essentially a copy of how the dogborg pounce works.
-Couple fixes to borg/animal pounces. (makes the pounce "animation" reset to default_y instead of hardcoded crap. Also disables spin on simplemobs when pouncing. Unfun maybe, but that var can always be toggled ingame to get the sick ninja moves)
-Adds adminbus switch to enable abuse mode on trasheater. (only skips the whitelist, blacklist still applies)
-Fixes a bunch of icon updates on the vorecode. Humanmobs no longer get forced canary runtiming mob icon updates, and the existing mob icon updates are no longer simplemob exclusive (and thus broken for pAIs and such)
-Earlyports a fix for mobs wandering off when grabbed.
-Earlyports a fix for adding verbs to mobs via varedit. (Was utterly broken for anything that wasn't STRICTLY a root type of human, robot, or AI. Also now works for simplemobs as well.)
2019-10-31 14:27:18 +02:00
Poojawa and GitHub
c4b9b86a9a
Update topic.dm
2019-10-29 01:14:00 -05:00
Poojawa and GitHub
1b41277376
turns cryo player searching for carbon mobs only
...
We really couldn't care less to despawn ghosts, would we?
2019-10-29 00:49:06 -05:00
Rykka
5219c1f97f
Stage only files without broken filediff
2019-10-28 15:39:32 -06:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
GeneriedJenelle and VirgoBot
3622a2fd2a
Ports World Server Dialogue/Attack Log Viewer
2019-09-28 03:38:06 -04:00
Atermonera and VirgoBot
42e0e8a91f
Merge pull request #6466 from Heroman3003/boompref
...
Makes lightning strikes respect weather sound pref
2019-09-27 16:06:09 -04:00
Atermonera and VirgoBot
4eb1e378f6
Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2
...
Orange Is The New Orange Part 2
2019-09-25 17:09:00 -04:00
Hawk_v3
9e88f55480
Merge remote-tracking branch 'upstream/release'
2019-09-16 14:57:39 +01:00
Heroman
c92960feca
Some post-release fixes
2019-09-15 06:27:32 +10:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Anewbe and VirgoBot
083a0634a0
Merge pull request #6429 from Heroman3003/idfix
...
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 18:27:58 -04:00
Heroman
cd5f25b853
Also adds feedback message
2019-08-29 08:12:11 +10:00
Heroman
ba71025007
Adds description to Request Spice
2019-08-29 07:59:39 +10:00
Hawk_v3
0973c49633
Merge remote-tracking branch 'upstream/master'
2019-08-27 00:22:31 +01:00
Heroman
f118fe8eda
Returns shadekin smites
2019-08-23 10:46:42 +10:00
Repede