cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 16:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,145 Commits 14 Branches 2 Tags
76aefc59df5da5e9161484d35b1cb92dc543b4cb
Commit Graph
17567 Commits
Author SHA1 Message Date
tigercat2000andGitHub 76aefc59df Merge pull request #8963 from FalseIncarnate/fluff 
E.L.O. Fluff 2
 2018-07-01 15:04:39 -07:00
Crazy LemonandGitHub 3ca333d666 Merge pull request #9040 from Anasari/CryoLog 
Cryo Logging PR
 2018-07-01 00:47:39 -07:00
FalseIncarnate 5823b354df merge conflicts 2018-07-01 02:42:31 -04:00
Crazy LemonandGitHub 3975a7d0f7 Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett 
Adds macaroni cheese (pizza)
 2018-06-30 22:11:05 -07:00
Crazy LemonandGitHub bdaa1813a2 Merge pull request #9149 from datlo/master 
Clown Magboots
 2018-06-30 22:08:29 -07:00
Crazy LemonandGitHub f1fc9375f5 Merge branch 'master' into LabelerLogging 2018-06-30 20:19:53 -07:00
Crazy LemonandGitHub 7d61c7f32d Merge pull request #9047 from Citinited/conveyor-belt-placer 
Adds the conveyor belt placer
 2018-06-29 21:11:49 -07:00
datlo 69779717fa Cut code duplication, added sprites 
Added a new variable to magboots called slowdown_passive, letting you
set how much the magboots slow you down when not activated, by default
SHOES_SLOWDOWN (same behaviour as before). Clown magboots use
SHOES_SLOWDOWN+1, same speed as clown shoes.

Removed redefinition of toggle as the magboots can now use the original
toggle properly.

Removed var/footstep which was copy pasted from the original clown
shoes, as far as I can tell it is not used or checked anywhere and
removing it does not silence squeeks or change any other behaviour.

Added sprites for the item icon and the mob's shoes when activated and
deactivated (adds a little red light that can be seen by a keen eye when
the shoes are activated)
 2018-06-29 20:22:22 +02:00
datlo 8a909e4da5 Clown Magboots V2 
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
 2018-06-28 12:10:22 +02:00
datlo 0100f679b0 Revert "Clown Magboots V1" 
This reverts commit 38d0c3652c.
 2018-06-28 12:03:11 +02:00
datlo 38d0c3652c Clown Magboots V1 
Item created, added to uplink
 2018-06-27 23:39:17 +02:00
Fox McCloudandGitHub 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
Anasari 5a09245029 Change to attack logs. Use ATKLOG_ALL 2018-06-26 16:47:09 +08:00
Anasari 6c8bba3f63 Merge branch 'master' into CryoLog 2018-06-26 16:24:29 +08:00
tigercat2000andGitHub 27841fdd5a Merge pull request #8895 from matt81093/death_squid 
Death Squid hitbox adjustment
 2018-06-22 00:09:02 -07:00
tigercat2000andGitHub 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
Shanewayne9andGitHub b6c5c9d3cf coin string fix 
from #9106
 2018-06-17 18:14:52 -07:00
tigercat2000andGitHub 78b2aa7288 Merge pull request #9116 from Kyep/login_runtime_fix 
Fixes can_vote runtime
 2018-06-14 12:14:55 -07:00
tigercat2000andGitHub 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
tigercat2000andGitHub 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
Kyepandtigercat2000 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
tigercat2000andGitHub 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
tigercat2000andGitHub 4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem 
Converts and Updates Weather Subsystem
 2018-06-13 16:08:02 -07:00
tigercat2000andGitHub 20a2594bfc Merge pull request #9046 from Fox-McCloud/wish-granter 
Datumizes Wishgranter
 2018-06-13 16:06:05 -07:00
tigercat2000andGitHub cb3627e6af Merge pull request #9066 from Fox-McCloud/pain-refactor 
Pain Refactor and Tweaks
 2018-06-13 14:24:53 -07:00
tigercat2000andGitHub 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
tigercat2000andGitHub bd29f7db83 Merge pull request #9076 from Fox-McCloud/speaking-medibot 
Ports Talking Medibot
 2018-06-13 13:55:23 -07:00
tigercat2000andGitHub c35ee54d27 Merge pull request #9057 from Aurorablade/PanzerSkullFluff 
PanzerSkull Fluff
 2018-06-13 13:48:18 -07:00
tigercat2000andGitHub 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
tigercat2000andGitHub ce2fb3bcbd Merge pull request #9072 from Tayyyyyyy/sling_dethrall_buff 
Reduce sling dethrall surgery steps
 2018-06-13 13:27:43 -07:00
tigercat2000andGitHub 49ef4be0e6 Merge pull request #9051 from Anasari/ConfirmationPossess 
Add confirmation prompt to possess object
 2018-06-13 13:27:11 -07:00
tigercat2000andGitHub 70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery 
Adds Plastic Surgery; Fixes Disfigurement
 2018-06-13 13:20:00 -07:00
tigercat2000andGitHub 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
tigercat2000andGitHub 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
tigercat2000andGitHub 2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix 
DS / prefs fix
 2018-06-08 11:59:05 -07:00
Crazy LemonandGitHub 5d1f5f5ef2 Merge pull request #8854 from tigercat2000/tcomms_optimize 
NTSL Optimizations
 2018-06-07 17:23:10 -07:00
tigercat2000andGitHub 41ef6f0ed0 Merge pull request #9098 from RyanSmake/nar_she 
Ports TG's Nar'Sie
 2018-06-07 17:02:55 -07:00