Commit Graph

36648 Commits

Author SHA1 Message Date
Novacat
e36d3d4e83 Merge pull request #7013 from VOREStation/upstream-merge-6906
[MIRROR] Fix runtimes in lungs.dm
2020-03-27 09:33:48 -04:00
Novacat
3b03231158 Update turbolift.dm 2020-03-27 08:40:36 -04:00
Novacat
702ccbee5c Update lungs.dm 2020-03-27 08:39:57 -04:00
Atermonera
c49c1e40f3 Fix runtimes in lungs.dm 2020-03-27 03:18:28 -04:00
Atermonera
f519ba6304 Remove turbolift_controller proccess, just use SSprocessing instead. 2020-03-27 03:15:10 -04:00
Arokha Sieyes
34a9cd4561 Fix stupid lung runtime 2020-03-27 00:41:36 -04:00
Novacat
a338bca46b Merge pull request #7008 from Natje0/master
Ports triple and 9x kitsune tails from YawnWider
2020-03-26 21:20:22 -04:00
TheFurryFeline
94ddb5eb13 Vakashi's Permit Expiration
Expired permit removal, code cleanup.

Changlog Notes:

- Removes Vakashi's Permit and allowed item.

- Also removes code for Ace's long expired permit and the same for the commented out items.
2020-03-26 20:50:26 -04:00
Natje0
66d6778957 Fixed tails.dmi to tails_vr.dmi 2020-03-27 00:52:29 +01:00
Natje0
fdd85c3812 Code for kitsune tails 2020-03-27 00:23:47 +01:00
Aronai Sieyes
38175a8cfd Merge pull request #7001 from VOREStation/aro-fix6844
Holodeck space turf fix
2020-03-26 16:00:45 -04:00
Aronai Sieyes
aef2081f46 Merge pull request #7005 from VOREStation/aro-fix6332
Emote noise toggle
2020-03-26 16:00:34 -04:00
Aronai Sieyes
bf31ccfd49 Merge pull request #7006 from VOREStation/aro-moreanounce
Remove the 'has cleared the' announcement for ships
2020-03-26 15:59:51 -04:00
Aronai Sieyes
710857ddd9 Same for dust 2020-03-26 12:41:01 -04:00
Aronai Sieyes
bb1494dfe3 Remove the 'has cleared the' announcement for ships 2020-03-26 11:55:40 -04:00
Aronai Sieyes
556ef6acc8 Emote noise toggle 2020-03-26 11:43:26 -04:00
Aronai Sieyes
0c624bf17a Holodeck space turf fix 2020-03-26 11:32:22 -04:00
Aronai Sieyes
e618f8d16d Redo morph TF code 2020-03-26 11:20:50 -04:00
Novacat
0ab0c1752f Merge pull request #6997 from Meghan-Rossi/timeclockfix
Fix: going on duty not giving correct access
2020-03-26 00:25:53 -04:00
Meghan-Rossi
eec914cf3a Refactor: don't list all open jobs just to check 1 job is open
Splits out the logic for checking if a job is available from the logic for listing all available jobs, so that when clocking someone in we can just check that the job is available instead of building the whole list of available jobs just to check that the job we're switching them to is still available.
2020-03-26 03:32:01 +00:00
Meghan-Rossi
eecd6f6e99 Refactor: check that there's a card in the timeclock once, not 3 times
checkFace() already checks that the card is still in the timeclock.  This commit removes two extra, unnecessary checks of this when clocking in or out.
2020-03-26 03:31:28 +00:00
Meghan-Rossi
a129a3fe16 Fix: only being able to go on-duty as a job's main title
We need to know the jobs main title to look up the access.  Tweaks the ui to keep track of it
2020-03-26 03:31:01 +00:00
Meghan-Rossi
6df3d45b53 Fix: going on duty not giving correct access
Currently going on duty gives you the access of the off duty job you already have, instead of looking up the job you're switching to and giving you access for that.  This fixes that.
2020-03-26 02:56:59 +00:00
Atermonera
8e5e83c2b5 Prometheans can be slipped again (#6898)
* Prometheans can be slipped again

* Update human_attackhand.dm
2020-03-25 20:59:57 -04:00
Novacat
3e8128c917 Merge pull request #6994 from VOREStation/upstream-merge-6885
[MIRROR] [Feature Tweak] Message Fixy For Snowballs/Kickstands
2020-03-25 19:22:39 -04:00
Novacat
a765098a46 Merge pull request #6989 from VOREStation/upstream-merge-6892
[MIRROR] Distillery tweaks
2020-03-25 19:22:23 -04:00
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands
[Feature Tweak] Message Fixy For Snowballs/Kickstands
2020-03-25 18:47:34 -04:00
Novacat
f9bfa6e56d Merge pull request #6987 from Novacat/nova-basicfixes
Fixes lurkers having super cloak
2020-03-25 16:53:51 -04:00
Novacat
00b148dd93 Merge pull request #6993 from VOREStation/upstream-merge-6896
[MIRROR] Repaths collapsible white canes to not anger beepsky
2020-03-25 16:53:36 -04:00
Novacat
b3dcc5cdc4 Merge pull request #6992 from VOREStation/upstream-merge-6897
[MIRROR] Silly admins can't blindly break movement irreparably
2020-03-25 16:53:26 -04:00
Novacat
850d637ffd Merge pull request #6991 from VOREStation/upstream-merge-6893
[MIRROR] Berserkjuice doesn't spam chat
2020-03-25 16:53:16 -04:00
Atermonera
027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
Atermonera
15e3ef676b Silly admins can't blindly break movement irreparably (#6897)
* Silly admins can't blindly break movement

* Updates pixel movement var protections
2020-03-25 16:39:06 -04:00
Atermonera
baf867e93d Besrserkjuice doesn't spam chat (#6893) 2020-03-25 16:37:53 -04:00
Atermonera
f6d626db67 Fix runtime in sound.dm: playsound(): source is an area (#6895) 2020-03-25 16:37:41 -04:00
Atermonera
6da6c7b1a5 Distillery tweaks (#6892)
* Basic distillery uses logistic temp change
Basic distillery pings when at temp
Industrial distillery repsects gas laws

* Expands examine text to be informative
Adds verbs to distillery

* Tweaks distillery costs
2020-03-25 16:36:26 -04:00
Unknown
a60d494a70 Fixes lurkers having super cloak 2020-03-25 16:02:38 -04:00
Leshana
96a3242c6e Remove temporary debug logging from SStimer 2020-03-25 00:18:19 -04:00
Novacat
15bdd59852 Merge pull request #6982 from VOREStation/upstream-merge-6854
[MIRROR] Xenoarch Expansion
2020-03-24 22:57:12 -04:00
Novacat
096270f7ab Merge pull request #6983 from VOREStation/events-removing-skybox
Quick fix to ensure events with skyboxes remove them at the end.
2020-03-24 22:57:03 -04:00
Shadow-Quill
463b41cd06 Grammar 2020-03-24 21:42:01 -05:00
Leshana
9d335cf678 Quick fix to ensure events with skyboxes remove them at the end. 2020-03-24 22:16:48 -04:00
Novacat
f60096634e Update ano_device_battery.dm 2020-03-24 21:45:09 -04:00
Atermonera
4384ca1727 Xenoarch Expansion 2020-03-24 21:43:27 -04:00
Novacat
ab54382995 Merge pull request #6980 from VOREStation/aro-dust
Fix dust zlevel choice
2020-03-24 21:10:32 -04:00
Aronai Sieyes
ac419404cb Fix Dust level choice 2020-03-24 20:51:12 -04:00
Atermonera
6c94faa167 Makes Travis fail PRs that runtime during init/unit testing. 2020-03-24 17:29:09 -04:00
Novacat
94d61d1568 Merge pull request #6974 from VOREStation/aro-fightermerge
Missed a color check on gunpods for paint
2020-03-24 17:07:52 -04:00
Aronai Sieyes
53e8fbff40 Missed a color check in colorable gunpods 2020-03-24 16:34:55 -04:00
Novacat
b6e26ea163 Merge pull request #6953 from TheFurryFeline/TFF-Attack_Verb_Grammar_Fixy_Again
[Oversight] Mob Attacktext Fixy
2020-03-24 16:34:39 -04:00