Fox McCloud
5170f3fbae
the-strength-of-this-world-fades
2019-10-04 19:34:08 -04:00
Fox McCloud
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
Fox McCloud
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
Fox McCloud
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
Fox McCloud
0ad54794fc
Fixes Extinguishing Some Fires ( #12410 )
2019-09-24 16:39:12 -07:00
Fox McCloud
cb8529cdb8
Makes Xenobiology Simpler. Removes Slimes ( #12398 )
2019-09-24 16:17:33 -07:00
Fox McCloud
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
Fox McCloud
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
Fox McCloud
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
variableundefined
db211cfc54
Deconflict
2019-09-11 23:00:13 -04:00
Fox McCloud
5943ad2902
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-10 07:09:30 -04:00
variableundefined
69537dd60c
Port TG hitby refactor and detonation of items by projectiles
2019-09-09 22:57:31 -04:00
Fox McCloud
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
Fox McCloud
177ac43f23
next-we-melt-the-memories-that-are
2019-09-09 16:20:04 -04:00
Fox McCloud
d19961378d
first-we-burn-away-the-world-that-was
2019-09-09 14:48:29 -04:00
Fox McCloud
607343424b
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-08 08:41:08 -04:00
Fox McCloud
dca6d98f5f
Refactors Corgis
2019-09-04 18:40:34 -04:00
variableundefined
289b890e76
Merge pull request #12087 from KasparoVy/skrekked_myself_up
...
Fixes Bug with Species-fitted Inhand Icons
2019-08-26 06:40:35 -04:00
KasparoVy
285df0d994
Fixes Inhand Sprite Sheeting Bug
...
Caused by #11978 , the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
2019-08-25 22:29:16 -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
variableundefined
e18777959e
Merge pull request #11818 from Couls/baseball-deflects
...
Baseball!
2019-08-23 08:05:41 -04:00
Couls
6d7ee9c934
use hit_reaction instead
2019-08-23 00:40:44 -04:00
joep van der velden
402d1ef131
No drop items now lose their nodrop if dropped
2019-07-29 00:03:18 +02:00
Mark van Alphen
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
Mark van Alphen
8822887784
Compile fix and asteroid turf placement fix
2019-06-03 01:21:03 +02:00
Mark van Alphen
c6e6c6cefd
Even better water handling
2019-06-03 00:31:03 +02:00
Mark van Alphen
acbf627f8c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
...
# Conflicts:
# code/modules/clothing/glasses/glasses.dm
# code/modules/customitems/item_defines.dm
2019-05-13 22:08:49 +02:00
Mark van Alphen
90f71f164a
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00
Mark van Alphen
93b45d91c5
Species chameleon fixes
2019-05-05 20:14:34 +02:00
variableundefined
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Mark van Alphen
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
Arkatos1
c6a91eafdd
Tweaks
2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c
Tweaks to Examine tooltips
2019-05-01 15:50:30 +02:00
Arkatos1
5b6e80af44
Adds examine tooltips
2019-04-25 21:11:22 +02:00
Fox McCloud
03d894ecfc
Merge remote-tracking branch 'upstream/master' into fix-cqc
...
# Conflicts:
# code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
Fox McCloud
814e492a55
Suicide Refactor
2019-03-27 22:54:26 -04:00
joep van der velden
e83a7131cc
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
variableundefined
d7b2648020
Merge pull request #10185 from Mitchs98/moveresist
...
Ports Move Force from TG
2018-12-28 20:53:07 +08:00
variableundefined
2f73a6ecb1
Merge pull request #10390 from MarsM0nd/Radial_Implants
...
Radial menu for implants and item_action icon.
2018-12-11 20:37:45 +08:00
Mars
7841d851f6
Item_action customizing icon + custom icons for arm implants
2018-12-01 13:42:38 +01:00
Citinited
6354631937
Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted
2018-12-01 00:13:21 +00:00
Citinited
88ff4eb49f
Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack
2018-11-28 22:21:59 +00:00
Citinited
fb15d92d57
Fixes issue with duct tape bypassing walls
2018-11-26 00:19:49 +00:00
Citinited
05b9955f2b
You can stick duct tape to more than just paper now
2018-11-25 23:03:10 +00:00
Fox McCloud
4969a03e94
Fixes and Updates CQC
2018-11-24 00:31:23 -05:00
variableundefined
214cf7b12e
Merge pull request #10288 from datlo/basicsofCQC
...
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
datlo
65286d7830
Adds the CQC manual to nukie uplinks
2018-11-20 03:51:52 +00:00
variableundefined
ef3a2ce9c5
Adds in missing stub signals
2018-11-17 09:26:13 +08:00
Mitchell
7cd25c4d87
for ansari to view
2018-11-11 15:59:48 -06:00
