cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,098 Commits 26 Branches 2 Tags
7d61c7f32dbd2cd8fb2b95d244183382dd31f135
Commit Graph

17547 Commits

Author SHA1 Message Date
Crazy Lemon
7d61c7f32d Merge pull request #9047 from Citinited/conveyor-belt-placer 
Adds the conveyor belt placer
 2018-06-29 21:11:49 -07:00
Fox McCloud
bfac50ef12 Merge pull request #9114 from MINIMAN10000/Fix-Emitters 
Fix emitters
 2018-06-26 22:29:55 -04:00
Citinited
e73ce56370 crazylemon tweaks 2018-06-26 22:18:27 +01:00
tigercat2000
27841fdd5a Merge pull request #8895 from matt81093/death_squid 
Death Squid hitbox adjustment
 2018-06-22 00:09:02 -07:00
tigercat2000
e82b2484e4 Merge pull request #9129 from Fox-McCloud/honkkkkkkk 
Customize Honk Sound for Clown Uniform
 2018-06-22 00:00:24 -07:00
Fox McCloud
6376f62959 Customize Honk Sound for Clown Uniform 2018-06-19 23:46:57 -04:00
MINIMAN10000
06cfcd156d Better method of deffered processing 2018-06-18 12:10:16 -07:00
Shanewayne9
b6c5c9d3cf coin string fix 
from #9106
 2018-06-17 18:14:52 -07:00
tigercat2000
78b2aa7288 Merge pull request #9116 from Kyep/login_runtime_fix 
Fixes can_vote runtime
 2018-06-14 12:14:55 -07:00
tigercat2000
87fa3e2dbe Merge pull request #9117 from variableundefined/voxswatfix 
Make it so that vox can wear SWAT suit
 2018-06-14 12:13:43 -07:00
variableundefined
f92f30de96 Make it so that vox can wear SWAT suit 2018-06-14 21:52:05 +08:00
Kyep
b65c84cd13 fixes can_vote runtime 2018-06-14 03:05:13 -07:00
MINIMAN10000
8bbce44c49 Fix emitters 2018-06-13 22:40:38 -07:00
shazbot194
731c1c72b4 Conflict Fix and update to sprite 2018-06-13 19:25:11 -08:00
shazbot194
bf43e13056 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Vox_suits 2018-06-13 19:09:32 -08:00
tigercat2000
f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -07:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992) 
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
 2018-06-13 16:55:21 -07:00
tigercat2000
07d585929f Merge pull request #8969 from Fox-McCloud/surgery-set 
Updates Surgery Augment: Adds it to R&D
 2018-06-13 16:24:53 -07:00
Anasari
d9d9857f57 Remove redundant src and upper limits 2018-06-14 07:23:40 +08:00
Fox McCloud
ed6075d5a5 beep 2018-06-13 19:10:24 -04:00
tigercat2000
4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem 
Converts and Updates Weather Subsystem
 2018-06-13 16:08:02 -07:00
tigercat2000
20a2594bfc Merge pull request #9046 from Fox-McCloud/wish-granter 
Datumizes Wishgranter
 2018-06-13 16:06:05 -07:00
tigercat2000
cb3627e6af Merge pull request #9066 from Fox-McCloud/pain-refactor 
Pain Refactor and Tweaks
 2018-06-13 14:24:53 -07:00
tigercat2000
32f7e22005 Merge pull request #9080 from Fox-McCloud/medbot-clean-up 
Cleans Up Medibot Code, Re-Allows Syndicate Medibot
 2018-06-13 13:57:05 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
tigercat2000
bd29f7db83 Merge pull request #9076 from Fox-McCloud/speaking-medibot 
Ports Talking Medibot
 2018-06-13 13:55:23 -07:00
tigercat2000
c35ee54d27 Merge pull request #9057 from Aurorablade/PanzerSkullFluff 
PanzerSkull Fluff
 2018-06-13 13:48:18 -07:00
tigercat2000
705b56eb4e Merge pull request #9006 from Kyep/login_logout_attack_log 
Adds login/logout to attack logs
 2018-06-13 13:30:41 -07:00
tigercat2000
ce2fb3bcbd Merge pull request #9072 from Tayyyyyyy/sling_dethrall_buff 
Reduce sling dethrall surgery steps
 2018-06-13 13:27:43 -07:00
tigercat2000
49ef4be0e6 Merge pull request #9051 from Anasari/ConfirmationPossess 
Add confirmation prompt to possess object
 2018-06-13 13:27:11 -07:00
tigercat2000
70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery 
Adds Plastic Surgery; Fixes Disfigurement
 2018-06-13 13:20:00 -07:00
tigercat2000
9978e22487 Merge pull request #8893 from Ty-Omaha/CDC 
Adds more viruses to the Viral Outbreak event
 2018-06-10 17:50:14 -07:00
FalseIncarnate
d7c684ce39 Fixes #9097 
Food on utensils now inherits the source food's name.
 2018-06-09 13:07:41 -04:00
Tayyyyyyy
04e13a57aa Restore a few steps 
Almost all surgeries tend to require hemostat and retractor, and this
brings sling dethrall in line with other surgeries
 2018-06-09 10:35:57 +08:00
tigercat2000
a3dc1b5468 Merge pull request #8765 from DesolateG/ROBOEDNO 
Fixes ED-209 and floorbot + changes to ED-209 behavior.
 2018-06-08 12:22:35 -07:00
tigercat2000
2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix 
DS / prefs fix
 2018-06-08 11:59:05 -07:00
Crazy Lemon
5d1f5f5ef2 Merge pull request #8854 from tigercat2000/tcomms_optimize 
NTSL Optimizations
 2018-06-07 17:23:10 -07:00
tigercat2000
41ef6f0ed0 Merge pull request #9098 from RyanSmake/nar_she 
Ports TG's Nar'Sie
 2018-06-07 17:02:55 -07:00
tigercat2000
b9a6383188 Merge remote-tracking branch 'upstream/master' into tcomms_optimize 
# Conflicts:
#	code/game/machinery/telecomms/telecomunications.dm
 2018-06-07 15:04:57 -07:00
Ansari
0b0b1b7478 Make it so that spray displays coordinate of user (Instead of the spray which is always 0,0,0) 2018-06-07 22:33:27 +08:00
Bxil
a1f540f238 Ports TG's Nar'Sie 2018-06-06 18:48:16 +02:00
tigercat2000
56d78c433d Merge pull request #7285 from Aurorablade/RingRingHello 
Ring! Ring! Hello?
 2018-06-06 00:19:07 -07:00
Crazy Lemon
1c516292ef Merge pull request #8900 from Kyep/ts_map_fix 
Terror Spider away mission pipes & vents
 2018-06-05 11:39:06 -07:00
Aurorablade
cbf8db9097 Merge pull request #27 from tigercat2000/ai_eye_refactors 
A handful of aiEye refactors
 2018-06-05 00:38:41 -04:00
tigercat2000
a90a2176e7 A handful of aiEye refactors 2018-06-04 21:29:35 -07:00
Aurorablade
fbfefdce0d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-06-05 00:15:42 -04:00
Fox McCloud
7fedb9363a capitals 2018-06-03 20:09:15 -04:00
Fox McCloud
482904befc Merge pull request #9086 from tigercat2000/spacemandmm_fixes 
Macro Refactor for SpacemanDMM
 2018-06-03 19:45:33 -04:00
Fox McCloud
d09cff7128 tweak 2018-06-03 19:07:02 -04:00
Fox McCloud
7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk 
# Conflicts:
#	code/game/objects/structures/window.dm
 2018-06-03 18:49:44 -04:00