Commit Graph

34935 Commits

Author SHA1 Message Date
Novacat
a6cda4268a Merge pull request #5648 from sharpestlight/master
wasp taurs
2019-08-19 16:57:19 -04:00
Novacat
df9f9fff42 Merge pull request #5634 from Heroman3003/grenadefix
Restricts station use of manhack grenades and seismic charges
2019-08-19 16:57:04 -04:00
Novacat
66967f6d02 Merge pull request #5617 from Novacat/nova-shuttle
New Expedition Shuttle
2019-08-19 16:56:51 -04:00
Novacat
dea67ec3bb Merge pull request #5608 from Mewchild/MC-Quality
Removes Awoo speech
2019-08-19 16:55:19 -04:00
Novacat
d84f38b4db Merge pull request #5581 from TheFurryFeline/TFF-Faces_4_Seats
Allows you to sit on someone's head
2019-08-19 16:55:05 -04:00
Novacat
1baa0b99ab Merge pull request #5568 from Novacat/nova-heterochromia
Adds a compact defibrillator crate
2019-08-19 16:54:52 -04:00
Atermonera
9c3ef7da32 Merge pull request #6405 from Nalarac/patch-1
Changes Hooligan Crab Meat to Crab Meat
2019-08-19 01:03:57 -04:00
Novacat
1131e32aad Merge pull request #5652 from Heroman3003/fishing-nerf
Nerfs damage of the fishing rods
2019-08-18 20:55:27 -04:00
Heroman
8bf8a16340 Nerfs damage of the fishing rods 2019-08-19 10:30:58 +10:00
Novacat
eea9fc9373 Merge pull request #5651 from Heroman3003/fix-the-whoopsie
Fixes roundstart runtime
2019-08-18 20:23:33 -04:00
Heroman
6e8f35d80d Fixes roundstart runtime 2019-08-19 10:10:54 +10:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
sharplight
ae106e186c wasp taurs
added wasp taurs to the game
2019-08-18 13:54:07 -04:00
TheFurryFeline
23b3450404 Descriptive Role Restriction on Accessories
Show what roles are allowed for webbing vests and drop pouches aside from the white variations.
2019-08-18 12:34:48 -04:00
Novacat
fd2a11553f Merge pull request #5638 from Heroman3003/manifix
Fixes borgs showing up in manifest in Misc category if they spawned roundstart
2019-08-17 21:09:48 -04:00
Heroman
b2f3cc9bb5 Fixes borgs showing up in manifest in Misc category if they spawned roundstart 2019-08-18 09:37:17 +10:00
Novacat
1e2a76d042 Merge pull request #5637 from Heroman3003/button-highlights
Adjusts modes of some buttons in character creation
2019-08-17 18:25:17 -04:00
Heroman
6f30d97bb9 Adjusts modes of some buttons in character creation 2019-08-18 08:03:04 +10:00
Heroman
4b0cc1810e Fixes a typo 2019-08-18 05:34:13 +10:00
Novacat
8320bdcd19 Merge pull request #5632 from Heroman3003/size-borg-fix
Fixes borgs not starting with their sizes set
2019-08-16 22:39:46 -04:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Heroman
8872a08a1a Fixes bugs with suit sensors and tether levels 2019-08-17 09:24:57 +10:00
Heroman
b2f2d12da6 Fixes borgs not starting with their sizes set 2019-08-17 06:53:04 +10:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Heroman
3e9456125a Restricts friendly manhack grenades to offstation use 2019-08-15 20:12:59 +10:00
Anewbe
4540551117 Merge pull request #6403 from Heroman3003/airuntime
Fixes language runtime upon ai creation
2019-08-14 21:38:28 -04:00
Mewchild
4ae966d3ff Removes Awoo speech 2019-08-14 03:47:01 -05:00
Novacat
f6fded4c4b Merge pull request #5607 from Heroman3003/customsay-fix
Fixes customsay not working for non-admins
2019-08-14 03:25:10 -04:00
Novacat
d611e2c657 Merge pull request #5605 from Ketrai/master
Indoor fishing tweaks
2019-08-14 03:24:50 -04:00
Heroman
349cc65134 Fixes customsay not working for non-admins 2019-08-14 17:06:37 +10:00
Novacat
8c5fea9225 Merge pull request #5604 from Heroman3003/lightingpower
Reduces power consumption of active lights
2019-08-14 03:04:59 -04:00
Ketrai
4fb9362b05 Makes the fishing time increase for indoor fishing only 10% longer 2019-08-14 08:57:45 +02:00
Heroman
bab3ae66dd Reduces power consumption of active lights 2019-08-14 16:50:30 +10:00
Novacat
36b3256045 Merge pull request #5595 from Heroman3003/fishing-pools
Changes fishing loot pools for indoor fishing
2019-08-14 00:32:30 -04:00
Novacat
77a59382d8 Update fishing_vr.dm 2019-08-14 00:18:35 -04:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
Heroman
6d43c8f45a Changes fishing loot pools for indoor fishing 2019-08-14 11:31:47 +10:00
Michiyamenotehifunana
1e34c97a9a Turns NIFSoft disks into neuromods 2019-08-13 14:02:36 +08:00
TheFurryFeline
223c23c100 No Blindess
Make it so you're not mechanically blind so you can hear regular emotes. But ICly, you'd still be blind, so.... Go nuts with that. :>
2019-08-12 18:02:34 -04:00
Novacat
0b8864135c Merge pull request #5586 from VOREStation/upstream-merge-6381
[MIRROR] Fixes Mech Cable Layer
2019-08-12 17:28:49 -04:00
TheFurryFeline
58d1a95454 Sod it
Spent like five hours trying to get it to work in a different file but it might well be better to just.... Do a 1:1 port with //VoreStation edit comments as per code practice here.
2019-08-12 16:51:43 -04:00
Anewbe
f758d8fb38 Merge pull request #6381 from Nalarac/CableLayer2
Fixes Mech Cable Layer
2019-08-12 16:33:41 -04:00
Anewbe
74ab7a563f Merge pull request #6390 from Heroman3003/bot-patrols
Makes bot patrolling into a map var
2019-08-12 16:32:28 -04:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 14:40:23 -04:00
Atermonera
6bb746995e Merge pull request #6401 from Shophaune/dronehatissues
Maybe fixes drone hat issues
2019-08-12 13:58:27 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
TheFurryFeline
de2438a860 Find Your Seats
Ports ChompStation facesitting, pretty much. :>
2019-08-12 10:14:10 -04:00
Spades
de8be8f2dc Merge pull request #5578 from BlackMajor/Dumb-verb
Adds an admin verb for spawning players as mobs with their vore prefs intact
2019-08-12 09:41:01 -04: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