Commit Graph

15684 Commits

Author SHA1 Message Date
Kyep
eebf2ade7f Adds playtime requirements for roles (e.g: antag roles)
- All antag roles now have playtime requirements.
- Solo antags require 3 hours, partner antags (e.g: guardian) require
5h, team-based antags (shadowlings, nukeops, etc) require 10h. Abductors
and ERTs require 20h.
- If someone can't choose a certain role, it will display as "[IN X
HRS]" in their preferences panel.
- These restrictions are enabled by the same config as job playtime
requirements are. Once this PR is merged, we can remove
USE_AGE_RESTRICTION_FOR_JOBS from our config.
2017-04-01 00:12:13 -07:00
Crazy Lemon
7687d3775f Merge pull request #6859 from Fox-McCloud/so-scarry
Removes "Scarry Sounds" Random Loop
2017-03-30 18:36:57 -07:00
Crazy Lemon
8cf82bcb7a Merge pull request #6937 from Fox-McCloud/autopsy
Autopsies No Longer Need Surgery
2017-03-30 18:36:21 -07:00
Crazy Lemon
9c233a676d Merge pull request #6865 from Fox-McCloud/receiverssss
Adds Modular Receivers to Loot Table and Hacked Autolathes
2017-03-30 18:32:32 -07:00
Crazy Lemon
a79d57045e Merge pull request #6983 from Fox-McCloud/drinking-glass-update
Improves Drinking Glass Colorization
2017-03-30 18:30:30 -07:00
Fox McCloud
b4e512d259 Merge pull request #6962 from davipatury/effect-to-structure
Ports /tg/ obj damage system - Part 1
2017-03-30 17:34:26 -04:00
Fox McCloud
10e112d439 Merge pull request #6901 from AndriiYukhymchak/nethfluff
Moonshine Bottle - Nethiafins donator item
2017-03-30 17:31:49 -04:00
davipatury
1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
Fox McCloud
ebf3ba1ad2 Merge pull request #6986 from KasparoVy/finest_alcoholism
Enhances Alcoholism
2017-03-30 07:19:31 -04:00
Fox McCloud
52d8ff85c7 Merge pull request #6989 from FlattestGuitar/sr-tweak
Strange Reagent tweak ✝️
2017-03-30 07:17:54 -04:00
Ronald T. Mullins III
828ad8eea6 Fixes #6993
The typo is actually "Incindiary" not "Incinidary". :3

Should this be done in a bigger Fixes PR? I just thought that I had free time and saw this sooo...
2017-03-29 20:26:55 -05:00
Fox McCloud
958618db8a Merge pull request #6974 from jughu/uristwhereareyou
Goodbye old friend
2017-03-29 17:02:35 -04:00
jughu
d464e19c43 Update mint.dm 2017-03-29 20:11:17 +02:00
FlattestGuitar
6158f5dfc3 SR tweak 2017-03-29 10:12:10 +02:00
KasparoVy
162f5602b1 Unique variable name.
For better readability.
2017-03-28 23:04:45 -04:00
KasparoVy
11953761fa Advanced Alcoholism
You can now click-drag drink containers onto yourself to start chugging.
2017-03-28 22:57:01 -04:00
Fox McCloud
00d8a089cd Merge pull request #6953 from tigercat2000/airlocks_ree
Completely remove second power/backup wire from airlocks.
2017-03-28 18:57:03 -04:00
Fox McCloud
44c17bc174 Merge pull request #6958 from KasparoVy/VoxBones2
Vox take 20% more brute damage. Fragile bird bones!
2017-03-28 18:55:16 -04:00
Fox-McCloud
7861df4dbe Improves Drinking Glass Colorization 2017-03-28 18:49:01 -04:00
KasparoVy
63564653bb Skrell can now choose undergarments. 2017-03-28 17:25:51 -04:00
jughu
b53a548678 Update machine_processing.dm 2017-03-28 19:36:50 +02:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
b91fbe264e effect/glowshroom to structure/glowshroom 2017-03-27 18:52:19 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03:00
KasparoVy
3b999a5109 Vox take 20% more brute damage. Fragile bird bones! 2017-03-27 05:41:12 -04:00
Fox McCloud
05e73f30eb Merge pull request #6819 from KasparoVy/Kidan-Antennae-Colourable-Skrell
Kidan Antennae + Greyscaled & Darkened Skrell
2017-03-27 04:40:30 -04:00
Fox McCloud
4d18372353 Merge pull request #6925 from SamHPurp/fixes-abductors
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
2017-03-27 04:33:30 -04:00
Fox McCloud
af68615415 Merge pull request #6956 from Crazylemon64/wire_mapload_fix
Away missions load cables and maploader landmarks smoothly now
2017-03-27 03:54:00 -04:00
Crazylemon64
babe5eb074 Away missions load cables, pipes, and templates OK now 2017-03-27 00:37:24 -07:00
Crazy Lemon
09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Fox McCloud
f7f127042c Merge pull request #6679 from Kyep/terrorspiders-PR5
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
Sam
8965ba9872 Misc grammatical fixes
Adds message to let people know when you're trying to yank out objects
from them
2017-03-27 06:16:24 +01:00
Tigercat2000
7d956d1500 Completely remove second power/backup wire from airlocks.
Pulsing them has been broken since commit 60994c59. Not many people know
they even exist. I figure the better solution than fixing them and
introducing a new behaviour to airlock hacking is to simply remove them
completely.
2017-03-26 17:03:41 -07:00
Fox McCloud
3e8244c244 Merge pull request #6932 from uraniummeltdown/metastation
Metastation Fixes
2017-03-26 19:34:38 -04:00
Fox McCloud
88ae43709f Merge pull request #6913 from SamHPurp/Unlocked-APCs
Quality of Life: Newly built APCs come unlocked.
2017-03-26 18:24:10 -04:00
Fox McCloud
031fcf3b0e Merge pull request #6533 from Kyep/gateway_centcomaway
Tweaks Centcom away mission to make it viable
2017-03-26 18:23:21 -04:00
Fox McCloud
238b79060c Merge pull request #6758 from FlattestGuitar/outfiterinos
Touches up the admin outfits. 🤳
2017-03-26 18:15:55 -04:00
Fox McCloud
9e52b87833 Merge pull request #6919 from TravellingMerchant/master
Adds a new set of cyberlimbs/IPC parts.
2017-03-26 18:14:22 -04:00
Fox McCloud
9e27d915d7 Merge pull request #6907 from FalseIncarnate/botany2
Don't Fear the Reaper
2017-03-26 18:12:52 -04:00
Sam
0b7a95933c Refactors bed/chair/stool deconstruction + more
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
2017-03-26 15:50:49 +01:00
Fox-McCloud
4137f237d7 Autopsies No Longer Need Surgery 2017-03-26 00:31:50 -04:00
FalseIncarnate
2d4e7d88ee CanPass tweak 2017-03-26 00:06:00 -04:00
FlattestGuitar
4445a34650 Merge branch 'master' into outfiterinos 2017-03-25 21:20:51 +01:00
FalseIncarnate
dfc56148d3 soil CanPass() override
Small piles of dirt are no longer going to stop you from your botanical
machinations.
2017-03-25 14:00:01 -04:00
FlattestGuitar
c0ac235704 Touching up the admin outfits... 2017-03-25 18:45:36 +01:00
uraniummeltdown
d592cf2dc2 Adds Armsky object; meeting room area icon; fixed layering of firelocks, windoors and shutters, shutter directions on meta; icon edited airlocks replaced with proper types on meta; drone console now checks area instead of oview(3); meta pod keys now work on sec pod; fixed meta command hallway vendors areas; added tiny fans to mass drivers on meta; fixed gateway doors access; fixed meta virology fridge 2017-03-25 17:10:13 +04:00
Crazylemon64
009c0f9c3c Pens no longer use comic sans 2017-03-25 02:57:32 -07:00
TravellingMerchant
ef949d273d Cleans up the code and adds the Shellguard monitor. 2017-03-25 03:14:24 +00:00
TravellingMerchant
740d66f953 Adds the Shellguard parts to the code list. 2017-03-25 03:13:14 +00:00