Commit Graph

11635 Commits

Author SHA1 Message Date
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo
Mob inventory cleanup, part 2
2016-04-21 21:07:22 -04:00
Nerezza
983aa8cf56 Wizard Federation Redacted
What illuminati?
2016-04-21 18:05:09 -05:00
Nerezza
24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Datraen
2b53efdfd5 Merge pull request #1303 from Hubblenaut/hydro
Full fertilizer bottles of type glass/bottle
2016-04-20 11:31:31 -04:00
EmperorJon
89d5175e12 Merge pull request #1438 from Datraen/GameModes2
Adds three new mixed modes.
2016-04-20 13:21:31 +01:00
Datraen
c24ba09834 Bumps up MercenaryRenegade gamemode requirement. 2016-04-19 13:05:05 -04:00
EmperorJon
28ab131610 Merge pull request #1441 from Yoshax/clickcooldownfix
Adds click cooldowns for attacking non-mob atoms for various mob types +other
2016-04-19 17:58:03 +01:00
Yoshax
a77d9269b0 Reduces table climbing time by one third 2016-04-18 18:29:03 +01:00
HarpyEagle
5faf635fae Adds click cooldown for certain cleanables 2016-04-18 15:27:12 +01:00
Datraen
a681213a02 Adds three new mixed modes! 2016-04-17 22:53:24 -04:00
Neerti
a1ae964c16 Merge pull request #1436 from Datraen/GuestPassOnTopic
Adds an access check to Guest Pass Terminals
2016-04-17 20:41:17 -04:00
Neerti
170fafcec7 Merge pull request #1432 from ParadoxSpace/FixesCult
Fixes Astral Journey Completely Destroying You
2016-04-17 20:41:05 -04:00
Datraen
bdcc36d8f0 Adds a check to the guest pass terminals to help prevent topic manipulation. 2016-04-17 18:00:04 -04:00
ParadoxSpace
5704a44bf8 saves us all
blessed be
2016-04-17 13:52:41 -06:00
Neerti
69a4242b17 Inventory Tweaks 1
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
2016-04-16 10:28:14 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100
2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
Datraen
a287d8b657 Merge pull request #1390 from Anewbe/Cryosleep
Shortens cryosleep timer
2016-04-15 11:16:20 -04:00
Jon
931719b336 Removes traitor check 2016-04-12 02:20:28 +01:00
Jon
327d4ba11b Fixes lockdown for Autotraitor synths. 2016-04-12 00:29:13 +01:00
Jon
2389b1d997 Part 1 of a lockdown fix.
Borgs now show the correct operational status/lock-unlock button in the UI.
Autotraitor borgs can still be locked down. This doesn't fix that.
2016-04-11 23:22:38 +01:00
Datraen
3a363173f9 Merge pull request #1400 from Mark9013100/4/11/2016cyro_dump_fix
Fixes cryocells dumping patients out without being asked to
2016-04-11 15:38:53 -04:00
Mark9013100
4be2c28edb Fixes cryocells dumping patients out without being asked to 2016-04-11 12:48:26 -04:00
Carl Ivanov
06813f01df Fixes Give Random (Head) Job 2016-04-11 16:44:34 +01:00
Anewbe
a9a47adb17 Shortens cryosleep timer 2016-04-09 15:34:06 -05:00
Yoshax
85e900c9fe Fixes some gamemode names 2016-04-09 20:02:56 +01:00
EmperorJon
2218b94e82 Merge pull request #1387 from Datraen/TwohandDropCheck
Two-handed items drop check.
2016-04-09 17:53:31 +01:00
Datraen
204c51597c Two-handed items check.
Adds a check to see if the item can be wielded when given or dropped when it is wielded.
2016-04-09 12:24:17 -04:00
EmperorJon
00f4ca2cab Merge pull request #1367 from Neerti/4/5/2016_ambition_tweaks_2
Ambition system tweaks
2016-04-08 22:52:48 +01:00
Neerti
d9dd1221fc Merge pull request #1350 from Kelenius/lingFixes
Fixes ling transforms
2016-04-06 20:23:06 -04:00
Neerti
777c6956b9 Merge pull request #1360 from Kelenius/noWords
Cultists no longer need to research words
2016-04-06 20:21:36 -04:00
Anewbe
ac79c48293 Lunchboxes should now fit in backpacks
* Lunchboxes should now fit in backpacks

* Makes lunchbox max_w_class 2
2016-04-06 20:19:55 -04:00
Neerti
25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Kelenius
aa3bcb6c26 Cultists no longer need to research words 2016-04-06 14:08:35 +03:00
Neerti
d6b58cfe8d Ambition system tweaks
Ports Bay's port of this.  Did it manually because of ugly merge conflicts.
What Psi did:
Admins can now see and set ambitions in antag panel.
Makes is_special_character() a bit better.
What I did:
Setting ambitions, with the verb or with admin powers, is now logged.
Round-end text changed to be blue instead of bolded, for better readability.
Makes the ambition system known to the antag at the bottom of the chat log instead of before the 'you are a X' prompt.
2016-04-06 06:27:32 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
PsiOmegaDelta
48b773fcfa Can now select the design and contents of your loadout lunchbox.
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
2016-04-05 11:57:30 -04:00
EmperorJon
648a74a5c9 Merge pull request #1353 from Yoshax/progressbarfix
Adjusts reinforced wall construction
2016-04-04 19:41:51 +01:00
Yoshax
2f95f98ec1 Adjusts secret game mode possibility formatting 2016-04-04 19:22:03 +01:00
Yoshax
0c5eb32fef Adjusts reinforced wall construction 2016-04-04 18:39:02 +01:00
EmperorJon
daf7c1065e Merge pull request #1349 from Neerti/4/4/2016_communicator_fix
Communicator Fix
2016-04-04 15:06:35 +01:00
Kelenius
2cfc6d7717 Fixes ling transforms
Lings transform name and species together
Ling always get languages from the DNA, be it by absorb, channel, or DNA
sting
Removed gender honorifics in lingchat because sometimes there's only one
female in the crew and it's easy to guess
2016-04-04 13:22:38 +03:00
Neerti
5b47212f48 Communicator Fix
Communicators now initialize properly, and are no longer invisible until the owner clicks the device in their hand for the first time in the round.
2016-04-04 05:17:07 -04:00
Datraen
54627608e1 Adds a portables pump station to the station.
* Adds a pump station to the station.

* Adds a digital valve for switching between the canisters and the waste loop.
2016-04-04 04:12:35 -04:00
Yoshax
fc845d12af Adds a missing comma 2016-04-03 17:31:51 +01:00