Commit Graph

2921 Commits

Author SHA1 Message Date
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
2019-09-11 01:28:55 -04:00
Fox McCloud
92f3edf853 tweaks to uplink 2019-09-11 01:20:30 -04:00
variableundefined
5ea0a9a7e3 Merge pull request #12242 from Fox-McCloud/ports-frozen-status-effect
Ports Frozen Status Effect
2019-09-10 19:38:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
43ae1c832a Ports Frozen Status Effect 2019-09-09 02:45:09 -04:00
Fox McCloud
dddfc9cffb crate fixes 2019-09-08 11:16:54 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
607343424b Refactors Vending Machines and Fixes Restocking Exploit 2019-09-08 08:41:08 -04:00
variableundefined
89dc45e057 Merge pull request #12230 from Fox-McCloud/tendril-refactor
Refactors Spawners/Tendrils
2019-09-07 20:22:22 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
TheSardele
49a514edd4 Sets Blood-Drunk Miner crusher trophy attack logs to all logs only 2019-09-07 22:14:10 +02:00
variableundefined
a0f2ecb362 Merge pull request #12199 from SteelSlayer/overload-override-machine-right-click-again
Changes behavior of the malf AI's overload/override machine abilities
2019-09-06 16:11:24 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
SteelSlayer
6411538157 these abilities are point and click now 2019-09-04 21:05:43 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00
variableundefined
271c62dbef Merge pull request #11535 from Couls/zombies
[Ready for review] Romerol Virus, Zombies!
2019-09-03 20:58:53 -04:00
Fox McCloud
91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
variableundefined
4ff30be09e Merge pull request #12118 from datlo/cursedoutfits
Add the Banana Touch and Mime Malaise wizard spells
2019-09-02 23:38:26 -04:00
Coul
5045980323 review changes 2019-09-02 05:32:15 -04:00
farie82
9d58af6ec5 Merge branch 'master' into hoodies 2019-08-30 22:57:07 +02:00
variableundefined
486f22ceb6 Merge pull request #11817 from Arkatos1/MalfButtons
Malfunctioning AI upgrade - Action Buttons!
2019-08-30 11:39:44 -04:00
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
datlo
72f1424b91 clarify spell descs 2019-08-28 20:26:17 +02:00
datlo
23fe308908 Add the banana touch and mime malaise spells 2019-08-28 19:49:52 +02:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined
e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
Arkatos1
6f32849938 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MalfButtons 2019-08-27 22:33:29 +02:00
variableundefined
d277e0c78d Merge pull request #11673 from Arkatos1/Magic-With-Style
Wizard Update - Magic with style
2019-08-27 16:04:52 -04:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
f694b483cf include new outfit data 2019-08-25 18:25:52 -04:00
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud
dd346515e5 additional suits 2019-08-25 17:42:48 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
2019-08-25 16:51:21 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy
Custom outfit manager and spawn with outfit on transform/reincarnate
2019-08-24 12:27:48 -04:00
variableundefined
a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop
Dropped anti drop items now lose the antidrop status if not initialized with it
2019-08-24 10:53:23 -04:00
Shadow-Quill
acafb38c74 Minmax
Sent from my iPhone.
2019-08-23 02:05:03 -05:00
Shadow-Quill
0f5cc3b026 Done 2019-08-23 00:25:59 -05:00
datlo
28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
farie82
3b433fbce5 Merge branch 'master' into hoodies 2019-08-15 18:10:31 +02:00