Commit Graph

820 Commits

Author SHA1 Message Date
Fox-McCloud
42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
Fox-McCloud
8e9eae8341 other "radios" 2017-07-01 00:14:36 -04:00
Fox-McCloud
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
tigercat2000
fb83d58607 Merge pull request #7436 from Alexshreds/emp
Radio EMP
2017-06-27 12:02:03 -07:00
tigercat2000
13a862be02 Merge pull request #7556 from SamHPurp/couple-more-random-variants
Adds random colours on cable cuffs & crayons, and the ability for flashes to start burnt out
2017-06-27 11:41:27 -07:00
Fox McCloud
3e065e730e Merge pull request #7554 from SamHPurp/more-qdel-nulls
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
Fox McCloud
a3de63e1c8 Merge pull request #7362 from TullyBurnalot/AutopsyReportProdigyChild
Adds Coroner Report Printer
2017-06-16 16:35:25 -04:00
Sam
804692d988 Adds a random option for flashes 2017-06-15 02:20:27 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Chakirski
db378ae8a7 faux2.0 2017-06-01 13:54:39 -05:00
Chakirski
93c7b4c6c3 faux 2017-06-01 13:38:53 -05:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Chakirski
90de04c77b randomness 2017-06-01 11:37:44 -05:00
Chakirski
e4bafed7df rip-freq 2017-06-01 11:36:40 -05:00
Chakirski
66bbd956b2 tegir 2017-06-01 00:16:43 -05:00
Alexshreds
fbed7c2ba8 radio-emp 2017-05-31 23:51:15 -05:00
Fox McCloud
6326115b61 Merge pull request #7405 from SamHPurp/SUPER-HIGH-PRIORITY-TWEAK-GAME-BREAKING-ARGHH
<span class='reallybig'>WHY ARE MEGAPHONES TINY ITEMS</span>
2017-05-29 16:30:33 -04:00
Fox McCloud
d9b409c0de Merge pull request #7399 from SamHPurp/shrinks-encryption-keys
Classes encryption keys as 'small' items
2017-05-29 16:30:21 -04:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
Sam
cc207e2e54 Enlarges megaphones 2017-05-27 22:54:13 +01:00
Sam
3bc135b825 Reverts Megaphone change
Will do in separate PR.
2017-05-27 22:11:51 +01:00
Sam
9943df05fd Fixes small issue 2017-05-27 20:07:39 +01:00
Fox McCloud
3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning
Cloning now puts you together bit by bit
2017-05-27 14:48:23 -04:00
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Sam
24eed4c740 Using the defines 2017-05-27 12:38:24 +01:00
Sam
d668cb7bf5 why are they bigger than the headsets they go in... 2017-05-26 22:05:08 +01:00
Fox McCloud
46e4c83942 Merge pull request #7368 from Fruerlund/Scannerpaperwork
Adds a print report functions to Handheld Chemistry Equipment
2017-05-25 12:30:28 -04:00
Fruerlund
7b7fcf643a Adds action buttons
The chem scanners will now use action buttons instead
2017-05-22 11:08:43 +02:00
Fruerlund
c3fc6951f7 Removes object verbs
If there are any trace results users will now be asked to print a log.
If they choose no, no log will be generated.
2017-05-21 16:58:16 +02:00
Fruerlund
40f4476bec Adds a print report functions
Mass Spectrometers and Reagent Scanners will now print reports if users
choose to.
2017-05-21 14:59:53 +02:00
TullyBurnalot
df4e30ae61 Adds Chemical Traces, Signature Area 2017-05-20 15:48:18 +01:00
TullyBurnalot
6c8ede0275 Adds sound 2017-05-20 15:11:50 +01:00
TullyBurnalot
bbc0eb94d3 Adds a Coroner Report Printer 2017-05-20 14:41:44 +01:00
TullyBurnalot
ca65b591d8 Addresses Fox Issues 2017-05-18 11:41:56 +01:00
TullyBurnalot
29b0b372fa Fixes Deaf Listening 2017-05-18 10:35:05 +01:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud
cc703a4882 Merge pull request #7249 from Crazylemon64/radio_gc_fix
Radios no longer double-dip initialize 4noraisin
2017-05-07 06:03:58 -04:00
Crazylemon64
6c8a20a825 Radios no longer double-dip initialize 4noraisin 2017-05-06 23:41:59 -07:00
Fox McCloud
8d4cc7b645 Organ and Autopsy Qdel Fixes and Minor Organ Tweaks (#7201)
* Organ and Autopsy Qdel Fixes

* organ tweaks

* tweaks
2017-05-06 15:26:45 -07:00
Crazylemon64
528e359296 Refactors heart attacks, unbreaks incremental cloning 2017-05-01 05:35:45 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Fox McCloud
0edc5400b3 Merge pull request #7080 from SamHPurp/loyalty-to-mindshield
Refactors any remaining Loyalty references to Mindshield
2017-04-11 19:50:59 -04:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Crazy Lemon
23180656c0 Merge pull request #7050 from Fox-McCloud/autopsy-fix
Fixes+Refactors Autopsy Scanner Printing
2017-04-06 00:04:28 -07:00
Fox-McCloud
ab5cab5af7 tweak 2017-04-05 23:46:53 -04:00