Commit Graph

11740 Commits

Author SHA1 Message Date
deathride58
fb704afb61 makes gloves of the northstar restore 2/3 of the stamina used up by harm intent punches on empty stam buffers (#7770) 2018-11-28 19:47:34 -08:00
nik707
60828a2da0 Merge pull request #7754 from deathride58/fixesghostrolesforreal
actually fixes ghost role spawners leaving null entries in mob_spawners
2018-11-26 04:10:10 -06:00
deathride58
d9b6979dff Merge pull request #7761 from Trilbyspaceclone/patch-11
Buffs Highlander stam
2018-11-25 07:18:27 -05:00
deathride58
0be6ce420a Merge pull request #7757 from Trilbyspaceclone/patch-9
Wallets can now hold valentine cards
2018-11-25 07:17:49 -05:00
deathride58
6699d2fce6 Merge pull request #7718 from Citadel-Station-13/kevinz000-patch-13
adds proper facename/coordinates to R&D logs
2018-11-25 07:17:03 -05:00
Trilbyspaceclone
b0a9bab300 Buffs Highlander stam 2018-11-24 00:09:41 -05:00
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
2018-11-23 15:12:19 -06:00
nik707
fd45662aaf Merge pull request #7746 from Citadel-Station-13/kevinz000-patch-9
"Why did I set piercing to two instead of one" and other miscellaneous beam rifle rebalances
2018-11-23 15:10:13 -06:00
nik707
489d565f2f Merge pull request #7752 from deathride58/fixesstealthboxes
ports tgstation/tgstation#40260 (fixes stealth implants)
2018-11-23 15:05:55 -06:00
nik707
1110a9449a Merge pull request #7748 from deathride58/buffedcacti
buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6)
2018-11-23 15:05:45 -06:00
nik707
df2048ef6b Merge pull request #7745 from Citadel-Station-13/kevinz000-patch-7
Fixes nanite Metabolic Synthesis
2018-11-23 15:05:02 -06:00
nik707
7cd129dc1a Merge pull request #7750 from deathride58/skintonedgenitals
Fixes the "genitals use skintone" option not appearing in the character appearance menu
2018-11-21 15:38:14 -06:00
Trilbyspaceclone
12e43ea5f3 Update wallets.dm 2018-11-21 02:44:59 -05:00
Trilbyspaceclone
5435fa4cba make triv rethink 2018-11-21 02:44:49 -05:00
Trilbyspaceclone
e5a0b8d677 Wallets can hold valentine cards 2018-11-21 02:00:23 -05:00
Trilbyspaceclone
bf4f9197dd So we can see them 2018-11-20 22:34:11 -05:00
deathride58
73ae6badb6 actually fixes ghost role spawners leaving null entries in mob_spawners 2018-11-20 22:24:47 -05:00
nik707
59dc18d904 Merge pull request #7637 from Trilbyspaceclone/Slimey_points
[READY] More Slime core deconstruction, now with Cross bread slime cores! (Best Grammar! 100% ready for merging PDM!!)
2018-11-20 19:49:25 -06:00
nik707
bea7b2a09f Merge pull request #7698 from Trilbyspaceclone/Cargo_memes_1
[Ready] More riot gear, cap pen and more!
2018-11-20 19:14:59 -06:00
Trilbyspaceclone
cd7ae39e04 Readdes skeles 2018-11-20 20:06:48 -05:00
Trilbyspaceclone
f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
Trilbyspaceclone
810f7f186d Headset sorrow 2018-11-20 19:37:13 -05:00
deathride58
cfaa0041b9 ports tgstation/tgstation#40260 2018-11-20 19:28:32 -05:00
Trilbyspaceclone
66b5f06514 Grammar 2018-11-20 16:39:01 -05:00
nik707
54506f6b2c Merge pull request #7742 from deathride58/yallnwahsdontevensmokeweed
Y'all n'wahs aint even smoke - adds skooma
2018-11-20 12:14:09 -06:00
deathride58
125b653cf8 fixes genitals use skintone not showing up in the character appearance menu 2018-11-20 09:15:32 -05:00
deathride58
9158d323a5 buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6) 2018-11-20 06:19:27 -05:00
nik707
251ff760ee Merge pull request #7741 from deathride58/defaultautofitviewport
Makes auto fit viewport enabled by default for new players
2018-11-20 00:05:43 -06:00
kevinz000
79b4d5f663 Update beam_rifle.dm 2018-11-19 20:24:21 -08:00
kevinz000
8418eadc5b Update rdconsole.dm 2018-11-19 20:11:29 -08:00
deathride58
a93751bc03 adds the ability to actually vote for maps instead of using tg's biased preference-based voting system (#7743) 2018-11-19 20:10:25 -08:00
kevinz000
074a582fed Update utility.dm 2018-11-19 20:09:06 -08:00
nik707
dbe0d00cc0 Merge pull request #7728 from deathride58/drowsyebows
Buffs ebows by making them deal 50 drowsiness
2018-11-19 18:05:40 -06:00
nik707
b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
nik707
7a3fec23ad Merge pull request #7735 from deathride58/abovelightinglayerairlocklights
Moves airlock lights to the above lighting layer. They now actually glow in the dark
2018-11-19 18:05:13 -06:00
nik707
025b990c1f Merge pull request #7737 from deathride58/changingvotesandseeingyourownvote
Makes the voting system actually track who voted for what - makes it possible to change your vote and shows you what you voted for
2018-11-19 18:05:01 -06:00
nik707
e3068079d6 Merge pull request #7738 from deathride58/getthefuckup
Using help intent on someone that's in hard stamcrit will now make them heal 15 staminaloss
2018-11-19 18:04:42 -06:00
nik707
2fa97f8089 Merge pull request #7708 from Citadel-Station-13/kevinz000-patch-8
Gives corpses an important scientific use
2018-11-19 13:10:50 -06:00
deathride58
313ec9cb6f removes rant comment to appease the hungersune 2018-11-19 10:13:09 -05:00
deathride58
9f7098231b y'all n'wahs don't even smoke weed - adds skooma (and adds the ability for reagents to define custom addiction stages) 2018-11-19 06:48:11 -05:00
deathride58
81aa3f6d88 Makes autofit viewport enabled by default for new players 2018-11-18 23:46:21 -05:00
Trilbyspaceclone
508f25c14d aye 2018-11-18 20:19:28 -05:00
deathride58
857c21a378 Fixes spawners with defined job descriptions causing the mob spawners list to fill up with null entries (makes spawner menu work again and properly removes ghost roles from latejoin menu when filled) (#7736)
* Fixes the mob spawner list being filled with null entries. (Fixes spawner menu and stops latejoin menu from showing filled ghost roles)

* oop hang on
2018-11-18 16:03:00 -08:00
deathride58
a7cf00263b Merge pull request #7697 from Trilbyspaceclone/patch-7
[Ready]Roboticist Headset in there vendor for a coin
2018-11-18 07:50:22 -05:00
deathride58
e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5
[Ready] Nerfs reactive armor a bit.
2018-11-18 07:42:42 -05:00
deathride58
500f068fe5 Merge pull request #7645 from Trilbyspaceclone/Tecweb_reblance
[Ready] Re-balance Tech Web nodes and points
2018-11-18 07:41:39 -05:00
deathride58
29bdaf3011 Merge pull request #7710 from Trilbyspaceclone/patch-8
[Grammar] [Ready] Makes Space Queens men pirate gear have better item descriptions
2018-11-18 07:39:14 -05:00
deathride58
90776bc4c9 Merge pull request #7721 from Tupinambis/Oldstation
Oldstation but it doesn't lag the server.
2018-11-18 07:38:37 -05:00
deathride58
c82abfb5a9 Merge pull request #7732 from Citadel-Station-13/kevinz000-patch-18
Cult deconversion now properly removes the blood halo
2018-11-18 07:38:22 -05:00
Trilbyspaceclone
5feebdc7d3 "Better Grammar or something" 2018-11-18 06:10:23 -05:00