Kazzc
ce80cc4c3e
Changed "usr" << to "to_chat(usr, )"
2020-01-15 03:07:07 -06:00
Kazzc
e3ce286ea4
Committed out the old "request Spice" from Virgo and made a new command for "request spice"
...
It should send a ding noise, comes with commands that allows an admin to "jump, give cookie, Look at VV, look at Player panel, DM them"
2020-01-14 14:40:21 -06:00
Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
TheFurryFeline
d98368beb9
Add Chomp edit comment.
2020-01-04 12:50:34 -05:00
TheFurryFeline
bb74b0ea65
Backport Quick-NIF Perms
...
Re-add ability for other staff to be able to quick-NIF others. Would allow testing devs to give themselves a NIF back if they lost it after a shift and so forth.
2020-01-04 12:46:47 -05:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Unknown
63f2fc0f20
Repurposing FTW
2019-12-25 13:54:31 -05:00
Razgriz
62bc00aac2
Add files via upload
2019-12-25 04:18:18 -07: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
Unknown
2e584ce3d0
Minor bug fixes
...
- Ahelps sent by admins are no longer sent to discord
2019-12-13 19:50:36 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Atermonera
42e0e8a91f
Merge pull request #6466 from Heroman3003/boompref
...
Makes lightning strikes respect weather sound pref
2019-09-27 16:06:09 -04:00
Atermonera
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
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
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01:00
BlackMajor
419db94458
Adds requested changes yeet
2019-08-11 17:22:20 +12:00
BlackMajor
67885bca42
Oh wait that's important
2019-08-11 02:03:32 +12:00
BlackMajor
1035c6e8dd
ew empty lines
2019-08-11 01:45:39 +12:00
BlackMajor
da7949b4b6
I should probably remove those debug messages
2019-08-11 01:38:57 +12:00
BlackMajor
0a2e805735
Adds spawn character as mob verb
2019-08-11 01:37:36 +12:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
1a15bb765d
Merge pull request #6387 from Heroman3003/ahelp-feedback
...
Makes ahelping on existing ticket give proper feedback
2019-08-08 16:09:05 -04:00
if there were two guys on the moon
e51356209e
10 min CD
2019-07-27 19:21:21 +01:00
if there were two guys on the moon
bd9c75327c
Request Spice
2019-07-27 17:04:21 +01:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Novacat
97e98dd04d
Merge pull request #4682 from VOREStation/upstream-merge-5829
...
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 16:37:45 -04:00
Novacat
7bd0f8e2db
Merge pull request #4676 from VOREStation/upstream-merge-5820
...
[MIRROR] Makes IC ticket response less rude
2019-03-27 15:18:06 -04:00
Novacat
a9f4906995
Merge pull request #4667 from VOREStation/upstream-merge-5772
...
[MIRROR] Refactors poi rotation to use degrees instead of dir
2019-03-27 15:16:02 -04:00
Neerti
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
Neerti
ee18328ce0
Refactors poi rotation to use degrees instead of dir
2019-03-27 12:57:16 -04:00
kevinz000
dfbd0bd72b
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00