cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 01:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

12118 Commits

Author SHA1 Message Date
TheDZD
88fa2d5b24 Merge pull request #3901 from Fox-McCloud/cable-coils 
Can Make Cable Coils in Autolathes
 2016-03-16 23:20:31 -04:00
TheDZD
85e2f1f0ab Merge pull request #3898 from Fox-McCloud/addiction-rework 
Addiction Rework
 2016-03-16 21:46:18 -04:00
TheDZD
723e150d28 Merge pull request #3896 from Fox-McCloud/heart 
Heart Tweaks
 2016-03-16 21:45:59 -04:00
TheDZD
be3c313189 Merge pull request #3887 from Fox-McCloud/bag-of-holding 
Bag of Holding Tweak
 2016-03-16 21:45:52 -04:00
Fox-McCloud
4ff472a0ea tweaks 2016-03-16 20:38:56 -04:00
Fox McCloud
2881d18903 Merge pull request #3892 from Tastyfish/crayon-ear 
Allows crayon to be put on ear
 2016-03-16 18:11:16 -04:00
TheDZD
336ad7a04d Merge pull request #3902 from Fox-McCloud/slotmachine-fix 
Fixes Slot Machine Announcements
 2016-03-16 16:02:15 -04:00
Aurorablade
b64d5012f7 added hallucinate code 
i had to redo hallucinate for it to work...cuase reasons. Ranged does a
burst fire, increased the cooldown cap cuase DAMN
 2016-03-16 08:04:03 -04:00
Aurorablade
5896ebc1ca bwoink 2016-03-16 03:53:38 -04:00
Fox-McCloud
7eeca1f18d Fixes Slot Machine Announcements 2016-03-15 23:41:00 -04:00
Fox-McCloud
08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
TheDZD
16401b4f16 Merge pull request #3858 from Fox-McCloud/changeling-headcrabs 
Implements Changeling Headcrabs
 2016-03-15 21:01:34 -04:00
Fox McCloud
4f68cf31a1 Merge pull request #3868 from Tastyfish/beach-again 
For beach, makes shallow->deep edge nicer.
 2016-03-15 18:55:35 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox-McCloud
35607d76da Heart Tweaks 2016-03-15 13:15:09 -04:00
Fox McCloud
0f2d8b1465 Merge pull request #3886 from Tastyfish/megaphone-fix 
Fixes megaphone
 2016-03-15 11:19:23 -04:00
Fox McCloud
6dfbcb5dcc Merge pull request #3871 from Tastyfish/chronx2 
fluff tweaks
 2016-03-15 11:17:15 -04:00
Fox McCloud
0f668a9118 Merge pull request #3863 from Crazylemon64/env_smash_girder_destroy 
Lets environment smashers smash through girders
 2016-03-15 11:15:58 -04:00
Fox McCloud
bad5eb6b2e Merge pull request #3865 from tigercat2000/tgcam 
Port -tg-station cameranets
 2016-03-15 11:04:25 -04:00
Tastyfish
68ce0246d4 Allows crayon to be put on ear 2016-03-15 08:30:18 -04:00
Tastyfish
e6dee17598 Fixes brig doors at midnight 2016-03-14 21:13:08 -04:00
Fox-McCloud
1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
Tastyfish
fd7b8f3c3f Fixes megaphone 2016-03-14 18:49:28 -04:00
Tigercat2000
b397ac11a8 RAAAAAAAAAAWR. 2016-03-14 15:01:27 -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
TheDZD
bf371094ee Merge pull request #3817 from Fox-McCloud/screaming 
Screamtastic
 2016-03-14 17:43:29 -04:00
Tigercat2000
562a70fcdf Is all good now, yaya. 2016-03-14 14:43:11 -07:00
Fox McCloud
55f6134b10 Merge pull request #3876 from Tastyfish/doors-fuck 
Derped and forgot to update shuttle dock doors
 2016-03-14 08:10:11 -04:00
Tastyfish
ddbd833d7d Derped and forgot to test shuttle door checks 2016-03-14 08:03:55 -04:00
Fox McCloud
b829c1dacf Merge pull request #3872 from Tastyfish/mimetweak 
Tweaks Recitence RCD
 2016-03-14 06:23:33 -04:00
Tastyfish
9a57702b1f Tweaks mime rcd 2016-03-14 06:11:18 -04:00
Tastyfish
96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
Tastyfish
ece677221f Made shallow->deep edge nicer 2016-03-14 02:56:37 -04:00
TheDZD
2254815612 Merge pull request #3857 from Fox-McCloud/xeno-tweaks 
Xeno Tweaks and Fixes
 2016-03-13 22:47:54 -04:00
TheDZD
418de45d07 Merge pull request #3860 from VampyrBytes/moveInsideFixes 
fixes move inside verbs (#3843)
 2016-03-13 22:22:40 -04:00
Fox McCloud
8ea7ac01c3 Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit 
Skeletons, Slime people, and other bloodless races no longer bleed
 2016-03-13 21:08:47 -04:00
Fox McCloud
5abd9d3ea8 Merge pull request #3848 from Tastyfish/tanknozzle 
Allows tank nozzle to be pulled out while on janicart
 2016-03-13 20:42:25 -04: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
Aurorablade
2eaff84f42 mogjtbosdopm ues 2016-03-13 08:08:15 -04:00
Crazylemon64
b27b58ce8f Lets environment smashers smash through girders 2016-03-13 04:33:59 -07:00
VampyrBytes
97dc434b22 fixes move inside verbs (#3843) 
fixes #3843
fixes the verbs being able to teleport people inside the spacepod or
recharge station
fixes ghosts being able to use the verbs
 2016-03-13 06:29:52 +00:00
Fox-McCloud
31217a058d Implements Changeling Headcrabs 2016-03-12 23:37:01 -05:00
Fox-McCloud
43ed8e8f0e whoops 2016-03-12 21:58:50 -05:00
Fox-McCloud
57b6475248 Xeno Tweaks and Fixes 2016-03-12 21:50:06 -05:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks 
Chem tweaks
 2016-03-12 20:20:33 -05:00
TheDZD
df8073f12e Merge pull request #3851 from Fox-McCloud/xeno-fixes 
Facehugger and Embryo Fixes
 2016-03-12 11:29:45 -05:00
Fox-McCloud
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
Aurorablade
cb20a1ca4f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-12 00:57:54 -05:00
Aurorablade
a653dfd69d god its late 2016-03-12 00:49:36 -05:00