Commit Graph

217 Commits

Author SHA1 Message Date
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
VampyrBytes
386ed87126 refactors washing items
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
2016-02-20 12:01:40 +00:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Fox-McCloud
f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Aurorablade
3a39d9d99d end conflict fixes
did i SERIOUSLY upload my comparison file last time? FUCK
2016-01-26 22:46:03 -05:00
Aurorablade
9b5f8445f8 begin conflict fix (2/2) 2016-01-26 21:12:03 -05:00
VampyrBytes
1517e716b1 Fixes #3354 and goes with damage suggestion in #3367
If you try to stab someone in the eyes who doesn't have eyes they now
take 10-14 head damage
2016-01-24 09:34:41 +00:00
VampyrBytes
d1cdbc3739 Revert "Fixes #3354"
This reverts commit d24b2fc014.
2016-01-24 09:28:50 +00:00
VampyrBytes
d24b2fc014 Fixes #3354
If you stab someone who doesn't have eyes in the eyes it now damages
their head
2016-01-24 08:37:10 +00:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05:00
Aurorablade
2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Tigercat2000
6c020780d9 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
2015-10-29 19:29:28 -07:00
cmbradsh
51e2384d97 item/examine() wasn't returning its value, thus all items seemed to be infinitely far away when using the return value from ..() in subclasses. 2015-10-22 00:05:19 -04:00
Tigercat2000
633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
2015-10-19 16:13:51 -07:00
Robertha89
acb55613d4 Better way of calling material and tech name 2015-10-10 12:11:19 +02:00
Robertha89
acb9ae2c4b Shows proper tech name 2015-10-10 01:38:59 +02:00
Robertha89
836ddb15d4 Science analyser goggles 2015-10-09 08:22:45 +02:00
Tigercat2000
545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/game/objects/items.dm
2015-10-08 11:16:30 -07:00
Fox McCloud
18a19df30f Merge pull request #2292 from tigercat2000/fancy
-tg- style inventory update, stripping update
2015-10-06 18:49:08 -04:00
Tigercat2000
4fc91429e5 Baystation Rigsuits
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
2015-10-05 16:42:00 -07:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Tigercat2000
8c97846746 -tg- style inventory update, stripping update
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Markolie
d8ad34ee17 Item examine fix, GC testing move 2015-09-18 06:42:46 +02:00
Markolie
951b58af5a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
Conflicts:
	code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie
aeabab7248 Welding tool refactor, in-hand updates 2015-09-16 01:27:15 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine
# Conflicts:
#	code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Tigercat2000
0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Markolie
2b23ba0048 In-hands can now be any size 2015-09-13 23:00:31 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Fox-McCloud
7c29e59784 Materialized Datums 2015-09-04 01:40:06 -04:00
Tigercat2000
b1f0fc4560 Remove arbitrary w_class restriction for xenos 2015-08-30 15:32:51 -07:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Markolie
9f6d46ddf0 Close span tags 2015-08-09 19:37:33 +02:00
Markolie
f09584e99a Fix amputees picking up items, make sure viruses don't affect robotic limbs 2015-08-09 19:36:39 +02:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
DZD
29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud
99bf49504a LINDA Pressure Changes 2015-07-11 06:28:03 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
DZD
b94c3deaf2 Initial Commit for -tg- Mining
I can guarantee this will not compile, very much a WIP and currently
consists of mostly copy+pasting -tg-'s modules/mining folder over ours,
and unticking a few of our own files.
2015-07-08 16:19:26 -04:00
Fox-McCloud
0e8619a202 Destroy Pass III 2015-07-08 03:39:52 -04:00
Tigercat2000
d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud
2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Krausus
3880364321 Fixes monkey quick-equip
Monkeys could use quick-equip to equip things they weren't supposed to.
2015-06-05 00:57:19 -04:00