1da334b35d
orangesisasuperdork
2015-06-29 15:49:21 +10:00
3564376bab
whoops
2015-06-29 15:48:56 +10:00
6ace1a1cd0
changelog
2015-06-29 15:39:44 +10:00
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
77a77dd107
Jetpack speed changes [DNM]
...
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)
The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
6c0a930cfb
Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
...
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
18c5ead218
Merge pull request #10233 from Xhuis/changelog
...
Changelog for gang fighting styles
2015-06-28 18:25:11 +02:00
ba6cf03cc6
Changelog for gang fighting styles
2015-06-28 12:21:36 -04:00
b6028d065f
Automatic changelog compile
2015-06-28 12:08:11 -04:00
8296c4642a
Changelog
2015-06-28 10:01:09 -06:00
615c0be697
Automatic changelog compile
2015-06-28 10:40:19 -04:00
c08cfb8018
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
...
Conflicts:
code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
25125d2067
Automatic changelog compile
2015-06-27 19:56:24 -04:00
1a5be75225
Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner
...
Admin help tweaks.
2015-06-28 02:55:53 +03:00
d9da2290e8
Cleans up adminhelp keyword searcher and changelog for #10196 .
2015-06-27 13:03:47 -07:00
1e842dfade
Automatic changelog compile
2015-06-27 13:39:20 -04:00
b8a1c3a95c
Merge pull request #10076 from LaharlMontogmmery/BlueSpaceTransfer
...
Storage Content Transfer : BoH long-range dump, BPRED tweaks
2015-06-27 13:37:41 -04:00
2dc17294cd
Automatic changelog compile
2015-06-27 13:35:40 -04:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
6ab2eb78e0
Merge pull request #10155 from Ikarrus/shredme
...
Burnable Objects & Clothes [Ready]
2015-06-27 18:29:14 +03:00
e6602cf123
Merge pull request #4 from tgstation/master
...
Merge with upstream
2015-06-27 10:27:43 +02:00
18098752ac
Gang Tweaks
...
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.
- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
7dc6a06d5e
Changelog update
2015-06-26 23:59:12 -05:00
50c1fc487e
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-26 23:49:43 -05:00
1aac98a52a
Merge pull request #3 from tgstation/master
...
Merge with upstream
2015-06-27 05:01:13 +02:00
c3d7397c73
Automatic changelog compile
2015-06-26 18:56:49 -04:00
ee13658752
Merge pull request #10018 from pudl/sam
...
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
8c9169f9a8
Merge pull request #10144 from phil235/StimulantsBuff
...
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
3c15ee4731
Merge pull request #10157 from KorPhaeron/rightandwrong
...
Summon Guns once again creates antagonists
2015-06-26 10:22:14 -05:00
530ae039a4
Merge pull request #10124 from Ikarrus/gangtweak2154
...
Gang Tweaks
2015-06-26 10:09:37 -05:00
875bfbd738
changelog
2015-06-25 20:52:47 -05:00
e73d66a9f4
changelog
2015-06-25 19:25:30 -05:00
ac321c547c
Rainbow slimes finally added to practical play. To get one you have to raise slimes through select breeding to 100 mutation chance. Even if you're blessed with RNG This will take a minimum of 14 generations of slime. Red slime can help speed this a bit, but then you're trading plasma for time. From the default mutation chance you'd have to drop 6 of these potions.
...
Rainbow slimes only split into more rainbow slimes.
Rainbow slime cores spawn a random colored slime on use, the practical use is to allow xenobiologists to slime paths they didn't breed for initially if they practiced good slime eugenics. You're still at the utter mercy of RNG though.
Mostly a bragging rights reward.
2015-06-25 18:20:09 -04:00
72ad13c5c6
Automatic changelog compile
2015-06-25 18:15:42 -04:00
15cdf9bfca
Merge from upstream.
2015-06-25 20:30:19 +02:00
bc8ffc4aa0
derp
2015-06-25 12:53:33 +02:00
454dc14b44
Merge pull request #10117 from Iamgoofball/explosive_implant
...
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
2015-06-25 12:49:03 +03:00
91556b65fa
Wizards have no sense of right and wrong
2015-06-25 02:10:52 -05:00
799b96fe7b
Automatic changelog compile
2015-06-24 21:08:37 -04:00
0449b61f5c
Bugfixes and sprites
2015-06-24 19:03:46 -06:00
cedd9ce4e6
Adding changelog
2015-06-25 01:01:40 +02:00
a029f2852a
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
ac63896910
- Foam/moke lifetime is no longer affected by reagents volume.
...
- Remove show_message argument from blob reagent reaction_mob()'s and remove the if(show_message) send_message(). Now send_message is called directly on each blob strike.
- Changed blob reagent effects to depend on volume so blob spore smoke isn't deadly.
- Breathing smoke now reduces its life expectancy and calls reaction(INGEST) with the accurate amount of reagent.
- Adjusted the effects on mobs of some other reagents.
- Adjusted reagent amounts in chem grenades.
2015-06-24 20:58:22 +02:00
6cab00e31b
Reverts BPRED change.
2015-06-24 19:51:28 +02:00
941fd2c102
Merge pull request #10046 from Ikarrus/rcradio
...
Request Console Radio Notifications
2015-06-24 10:33:00 -05:00
ab36f89844
NUKE OPS START WITH MICROBOMBS NOW, nerfs microbombs because I made them way too powerful and 20 of them was actually double the bombcap
2015-06-23 21:37:21 -07:00
c513ff1dde
Gang Tweaks
...
- Gangs have a maximum of three attempts at dominations
- Added a couple of redone gang tag sprites by Joan
2015-06-23 21:35:56 -06:00
Jordie
Orange Borg
Cheridan
Swag McYolosteinen
Xhuis
sybil-tgstation13
Ikarrus
phil235
Razharas
MrStonedOne
WJohn
LaharlMontogmmery
nullquery
TheVekter
phil235
pudl
Incoming
KorPhaeron
Iamgoofball