0774bca2f4
wew
2020-03-25 20:51:42 -07:00
4a84736eff
more
2020-03-24 19:57:04 -07:00
1a7e812d55
wip
2020-03-24 19:51:23 -07:00
2e0992dbb9
k
2020-03-24 19:29:54 -07:00
d139234c6d
my smooth brain hurts
2020-03-23 16:06:40 -07:00
fa9c1dfd6c
start
2020-03-23 16:05:22 -07:00
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
613c66d88e
Automatic changelog generation for PR #11524 [ci skip]
2020-03-23 12:40:34 -05:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
afe762ba4d
Automatic changelog generation for PR #11536 [ci skip]
2020-03-23 12:40:22 -05:00
cc80d463b7
Merge pull request #11536 from Trilbyspaceclone/patch-316
...
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
a63aaa2c9b
Automatic changelog generation for PR #11570 [ci skip]
2020-03-23 12:38:25 -05:00
33317e20fe
Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
...
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
3990b1f4c9
Merge pull request #11571 from Ghommie/Ghommie-cit635
...
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
77b92f3f78
Automatic changelog generation for PR #11572 [ci skip]
2020-03-23 12:37:45 -05:00
ddd00b1981
Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
...
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
3f653c7d57
Automatic changelog generation for PR #11576 [ci skip]
2020-03-23 12:36:47 -05:00
fbe77495e8
Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
...
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
e6e73e0888
Automatic changelog generation for PR #11578 [ci skip]
2020-03-23 12:36:20 -05:00
dfec544d71
Merge pull request #11578 from Ghommie/Ghommie-cit636
...
Fixing owner not being set in mutation/on_aquiring.
2020-03-23 10:36:17 -07:00
96f0d51184
Automatic changelog generation for PR #11581 [ci skip]
2020-03-23 12:34:05 -05:00
57429493c6
Merge pull request #11581 from Ghommie/Ghommie-cit637
...
M/F body preferences.
2020-03-23 10:34:02 -07:00
8ca7ffd780
Automatic changelog generation for PR #11582 [ci skip]
2020-03-23 12:28:17 -05:00
9be09df036
Merge pull request #11582 from keronshb/ReverseRNGMiningBase
...
Reverses Random Mining Base Placement
2020-03-23 10:28:14 -07:00
ecbf84d21d
Fixes the duplicate lavaland on shuttle issue
...
Fixes the duplicate lavaland on shuttle issue
2020-03-23 12:43:51 -04:00
1d2264849e
meh ( #11584 )
2020-03-23 15:50:53 +01:00
5ccd38a59e
Automatic changelog generation for PR #11573 [ci skip]
2020-03-23 09:47:44 -05:00
f5a96241ab
sneaksuits are not fireproof ( #11573 )
...
* and i wanna die
* i decide to revert
* a a a a
2020-03-23 15:47:41 +01:00
a5224b0b8b
Merge pull request #11568 from Ghommie/Ghommie-cit634
...
Two runtimes, one fix.
2020-03-23 00:03:23 -07:00
29576ee6a7
Travis Please
2020-03-22 20:34:38 -04:00
0effeb6ed5
Ports Hyper Drinks
...
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
a6ca854e5c
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-22 15:07:41 -07:00
c798b31d6f
bodyparts cache aaaaa.
2020-03-22 22:20:26 +01:00
739cd21d7c
Checked lavaland
...
Checked lavaland
2020-03-22 16:17:23 -04:00
7776fff850
Lavaland change
...
Revert
2020-03-22 16:00:24 -04:00
830f646383
Revert "Merge pull request #11225 from r4d6/Random-Mining"
...
This reverts commit ea5774e713
2020-03-22 15:55:08 -04:00
9d9720ed21
QoL Vendor Reorganisation
...
Moves Bowls and Glasses to top of vendors.
2020-03-22 15:30:29 -04:00
cd3f8f5df5
Porting More Stuff
...
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
2020-03-22 15:13:00 -04:00
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
82cf7e584b
Update SDQL_2_wrappers.dm ( #11552 )
2020-03-22 13:40:31 +01:00
161a91ec9a
Automatic changelog generation for PR #11559 [ci skip]
2020-03-22 07:37:18 -05:00
0b71b51360
Update stunbaton.dm ( #11559 )
2020-03-22 13:37:16 +01:00
b7e16f296d
Automatic changelog generation for PR #11543 [ci skip]
2020-03-22 07:13:43 -05:00
80baf85300
Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics ( #11543 )
...
* Maps Bumbles in for once
* Hopefully fixes merge conflicts?
2020-03-22 13:13:40 +01:00
f336fe2174
Automatic changelog generation for PR #11564 [ci skip]
2020-03-22 07:12:17 -05:00
71fc6bc693
Fixes bumbles resting ( #11564 )
...
* Fixes bumbles resting
* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update bumbles.dm
* Update bumbles.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-22 13:12:14 +01:00
ee8bbf1165
Automatic changelog generation for PR #11560 [ci skip]
2020-03-22 07:11:40 -05:00
043de9dcd2
Removes the roundstart syringe guns on each map, replacing them with medidart guns. ( #11560 )
...
* nukes roundstart syringe guns for roundstart dart guns.
* fixes the delta and meta maint syringes to have an identical change.
* brings lambda up to date with master.
2020-03-22 13:11:37 +01:00
d3edc2c528
Automatic changelog generation for PR #11549 [ci skip]
2020-03-22 07:02:25 -05:00
kevinz000