cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 15:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,833 Commits 28 Branches 2 Tags
1d2bfbf044cf5727bc3d30cd4fe856866105746f
Commit Graph

1419 Commits

Author SHA1 Message Date
Fox McCloud
0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application 
Makes DNA swapping methods more reliable and other appearance tweaks
 2016-03-18 21:37:20 -04:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable 
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
 2016-03-17 23:07:45 -07:00
Tigercat2000
296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2016-03-14 14:45:21 -07:00
Tigercat2000
bc78146178 Port -tg-station cameranets 
This should make it much easier to port abductors, if we ever want to do
that.

Changes:
  - Fixed a bug where the AI could not delete photos it takes.
  - Ported -tg- cameranets. This means that all of our camera based systems are more or less up to date with -tg-; 510 features are missing.
  - An AI with the 'camera lights' mode on will now, instead of the button toggling the closest camera's light, toggle camera lights on/off as the AI moves.
  - It now takes a minimum of 30 deciseconds between attempting to track someone, and locking on. This number is increased by their distance away from the AI eye.
  - The camera activate/deactivate proc is now called 'toggle_cam'.
  - The 'trackable' proc has been replaced by a more object-oriented 'mob.can_track()' proc.
  - The 'networks' section of the security camera console is now above the camera list.

In laymans terms: This refactors how security cameras calculate what
viewers can see, and adds a few neat features on top.
 2016-03-13 15:06:24 -07:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks 
Chem tweaks
 2016-03-12 20:20:33 -05:00
Aurorablade
cb20a1ca4f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-12 00:57:54 -05:00
TheDZD
350086fc85 Merge pull request #3823 from Fox-McCloud/nukies-cybernetics 
Implements Nuke Ops Cybernetics
 2016-03-11 21:26:44 -05:00
Aurorablade
848a590930 daemon 2016-03-11 01:48:09 -05:00
Aurorablade
70c510280a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-10 20:19:08 -05:00
Aurorablade
7218478c9e tigerrawr 2016-03-10 19:46:17 -05:00
Fox-McCloud
b19e558d78 Implements Nuke Ops Cybernetics 2016-03-10 07:10:29 -05:00
Tastyfish
1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Fox-McCloud
2dfe617998 Chem Tweaks 2016-03-10 00:28:49 -05:00
Fox McCloud
953c4ba1b2 Merge pull request #3786 from TheDZD/WEEEEEOOOOOWEEEEEOOOOOWEEEEEOOOOO 
Brings Justice to the Station
 2016-03-08 20:14:43 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
Aurorablade
6918e79943 Rawr 2016-03-07 19:53:14 -05:00
TheDZD
daf0c6bc31 Brings justice to the station 2016-03-07 17:50:41 -05:00
Fox McCloud
c3285d20ef Merge pull request #3777 from Tastyfish/wiznerd 
Fixes lich spell preventing round end when viewed in the spellbook
 2016-03-06 22:13:26 -05:00
Tastyfish
422a2e6ed4 Fixes lich spell preventing round end when viewed in the spellbook 2016-03-06 21:59:48 -05:00
Tastyfish
a4e3fc7905 Fixes /datum/events, and by proxy the cable layer 2016-03-06 20:08:37 -05:00
Tastyfish
d189d70f4a Adds tranquillite 
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
 2016-03-06 01:49:30 -05:00
TheDZD
4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss 
Removes Halloss
 2016-03-05 22:39:19 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Fox-McCloud
4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Fox McCloud
60b0d6f2fe Merge pull request #3639 from Crazylemon64/matrix_and_path_editing 
Adds matrix and path editing to the variable viewer
 2016-03-03 20:31:25 -05:00
TheDZD
c3d679eb47 Merge pull request #3736 from Fox-McCloud/miming-refactor 
Miming Refactor
 2016-02-29 22:42:26 -05:00
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Fox-McCloud
84def6e144 Adds Sleeping Carp Scroll to Uplink 2016-02-28 02:08:32 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox-McCloud
cbdc93ea6a Tweaks Pickpocket Gloves 2016-02-23 22:56:21 -05:00
Tastyfish
85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
Crazylemon64
8a7a17b8e6 Adds matrix and path editing to the variable viewer 2016-02-19 01:20:01 -08:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Fox-McCloud
9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
Aurorablade
400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Aurorablade
9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
TheDZD
65a788d51f Merge pull request #3569 from Fox-McCloud/unarmed-golems-martial 
Unarmed Attack+Martial Arts Update+Golem Refactor
 2016-02-12 18:17:32 -05:00
Fox-McCloud
f37a21a91a carp grab fix 2016-02-11 21:45:30 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox-McCloud
34e45a656e Unarmed Attack+Martial Arts Update+Golem Refactor 2016-02-11 00:11:20 -05:00
Fox-McCloud
5f2b5f1fde Updates Fake Disintegrate and Spell Icons 2016-02-10 00:01:37 -05:00
Fox McCloud
05ba314d1b Merge pull request #3530 from Robertha89/patch-6 
add tesla to supplypacks
 2016-02-08 18:26:27 -05:00
Robertha89
15e37b498c Removes a grounding rod 2016-02-07 23:07:59 +01:00
Robertha89
a743335161 add grounding, and coil, minor fixes. 2016-02-07 23:06:49 +01:00
Robertha89
dba3a8d937 Fixes issue 2016-02-07 19:40:19 +01:00
Robertha89
8accdb52db add tesla to supplypacks 2016-02-07 19:27:22 +01:00
Fox-McCloud
a64e95104e Removes Mindswap Suiciding 2016-02-05 22:30:43 -05:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair 
Squishy Slime Hair Woooooo
 2016-02-02 21:14:54 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Crazylemon64
945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08:00