Commit Graph

22621 Commits

Author SHA1 Message Date
Neerti
0c4f3b7315 Merge pull request #1389 from Yoshax/gamemodenamesfixes
Fixes some gamemode names
2016-04-09 21:47:30 -04:00
woodratt
ab49ae802a 1.5.0 Striped Socks
- Added green, purple, blue, yellow, red, and orange striped socks. Thigh and knee high options.
2016-04-09 15:20:37 -07: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
66b731783f Merge pull request #1386 from Datraen/BetterStealthmin
Changes mob names of admins that stealth while in lobby.
2016-04-09 18:35:55 +01:00
Jon
9903cf4361 Changes the feed creator for the Vir Times to a Vir Times Exonet Node for the station, as opposed to "SolGov Minister for Information" which was a little outdated and incongruous. 2016-04-09 18:25:46 +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
1555ff98e1 Merge pull request #1384 from Datraen/DarkClick
Manually ports /tg/'s darkclick code.
2016-04-09 15:57:23 +01:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code.
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -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
EmperorJon
d3cd8c0387 Merge pull request #1376 from Yoshax/followanything
Ghosts can now follow any /atom/movable object.
2016-04-08 22:52:37 +01:00
Neerti
80e31484d3 Merge pull request #1381 from Datraen/LoadoutFix
Adds jumpskirt to the jumpclothes list, renames selections for clothing.
2016-04-08 17:28:44 -04:00
Datraen
d40b34d4dc Adds jumpskirt to the jumpclothes list, renames selections for clothing. 2016-04-08 14:02:56 -04:00
Anewbe
d2318ca1b2 Spike regen rate changed 2016-04-07 16:38:42 -05:00
PsiOmegaDelta
52ecd6dbe1 Ghosts can now follow any /atom/movable object. 2016-04-07 19:26:57 +01:00
Datraen
dab56d472b Adds default reagent amounts to slices if they have no reagents. 2016-04-06 23:50:14 -04:00
Mark9013100
44338ae259 Edits name of HOS armor vest 2016-04-06 22:08:23 -04: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
PsiOmegaDelta
15aed1ade4 Makes it possible to further customize loadout items.
Can now configure the path and contents of loadout items.
2016-04-05 11:47:15 -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
3971b93731 Merge pull request #1347 from Neerti/4/4/2016_hugbox
Removes Head Gibbing
2016-04-04 17:56:47 +01:00
Datraen
3e6c9f8110 Merge pull request #1318 from Neerti/3/31/2016_go_away_icarus
Fixes Icarus reference, when mercs come to the colony with the cloak off
2016-04-04 11:27:55 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -04:00
EmperorJon
1e20f816ad Merge pull request #1348 from Neerti/4/4/2016_lwap_nerf
Laser Snipers no longer stun on hit.
2016-04-04 15:07:07 +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
Kelenius
e06df420fc Adds color to unit tests 2016-04-04 11:46:39 +03: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
Neerti
53c16f02bb Laser Snipers no longer stun on hit. 2016-04-04 04:02:52 -04:00
Neerti
8f1e878cb8 Adds variable to disallow gibbing of limbs, checked after the variable to disallow dismemberment.
The head can no longer be gibbed.  Severing the head via sharp weapons remains an option.
2016-04-04 03:42:46 -04:00
Neerti
4eff2f8d10 Merge pull request #1346 from EmperorJon/03_Apr._Jeans_colour_change
Various changes to jeans
2016-04-03 19:27:47 -04:00
Jon
eb0efbf2ef Adds grey jeans, jeans shorts, and jeans shorts (female). Kinda annoyed we have so many variants but that's for another day.
The grey jeans are the black jeans sprite (which are grey...)
The black jeans are now darker! But they still look different from black pants.
The black shorts have had their side-sprites darkened so they look black, not grey, and match the front/back view better.
The new grey variants keep those grey sides and have grey back and fronts too.
2016-04-04 00:07:50 +01:00
EmperorJon
b429c7b7e8 Merge pull request #1345 from Neerti/4/3/2016_fixes_cloaks_and_guns
Firing a gun while cloaked will now unclock you.
2016-04-03 23:34:11 +01:00
Neerti
151082343b Firing a gun while cloaked will now unclock you. 2016-04-03 18:20:07 -04:00
EmperorJon
bdede3c3fd Merge pull request #1341 from Yoshax/lunchboxes
Adds lunchboxes
2016-04-03 20:25:19 +01:00
Yoshax
36c1746f37 Adjusts lunchbox loadout cost 2016-04-03 20:21:19 +01:00
Yoshax
fc845d12af Adds a missing comma 2016-04-03 17:31:51 +01:00
Yoshax
35d8092d98 Further cleans up pathing in file 2016-04-03 17:26:23 +01:00